Skip to content

Commit 6f5afa3

Browse files
committed
fix syntax
1 parent a5c36ed commit 6f5afa3

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/resources/views/crud/fields/relationship/fetch.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ function bpFieldInitFetchElement(element) {
186186
var $dependencies = JSON.parse(element.attr('data-dependencies'));
187187
var $allows_null = element.attr('data-column-nullable') == 'true' ? true : false;
188188
var $appLang = element.attr('data-app-current-lang');
189-
var $selectedOptions = JSON.parse(element.attr('data-selected-options') ? element.attr('data-selected-options') : null);
189+
var $selectedOptions = typeof element.attr('data-selected-options') === 'string' ? JSON.parse(element.attr('data-selected-options')) : JSON.parse(null);
190190
var $multiple = element.prop('multiple');
191191
192192
var FetchAjaxFetchSelectedEntry = function (element) {

src/resources/views/crud/fields/relationship/fetch_or_create.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ function bpFieldInitFetchOrCreateElement(element) {
510510
var $modelKey = element.attr('data-model-local-key');
511511
var $allows_null = (element.attr('data-allows-null') == 'true') ? true : false;
512512
var $appLang = element.attr('data-app-current-lang');
513-
var $selectedOptions = JSON.parse(element.attr('data-selected-options') ? element.attr('data-selected-options') : null);
513+
var $selectedOptions = typeof element.attr('data-selected-options') === 'string' ? JSON.parse(element.attr('data-selected-options')) : JSON.parse(null);
514514
var $multiple = element.prop('multiple');
515515
516516
var FetchOrCreateAjaxFetchSelectedEntry = function (element) {

src/resources/views/crud/fields/relationship/relationship_select.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ function bpFieldInitRelationshipSelectElement(element) {
143143
var $includeAllFormFields = element.attr('data-include-all-form-fields') == 'false' ? false : true;
144144
var $dependencies = JSON.parse(element.attr('data-dependencies'));
145145
var $multiple = element.attr('data-field-multiple') == 'false' ? false : true;
146-
var $selectedOptions = JSON.parse(element.attr('data-selected-options') ? element.attr('data-selected-options') : null);
146+
var $selectedOptions = typeof element.attr('data-selected-options') === 'string' ? JSON.parse(element.attr('data-selected-options')) : JSON.parse(null);
147147
var $allows_null = (element.attr('data-column-nullable') == 'true') ? true : false;
148148
var $allowClear = $allows_null;
149149

src/resources/views/crud/fields/select2_from_ajax.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ function bpFieldInitSelect2FromAjaxElement(element) {
108108
var $allowClear = element.attr('data-column-nullable') == 'true' ? true : false;
109109
var $dependencies = JSON.parse(element.attr('data-dependencies'));
110110
var $ajaxDelay = element.attr('data-ajax-delay');
111-
var $selectedOptions = JSON.parse(element.attr('data-selected-options') ? element.attr('data-selected-options') : null);
111+
var $selectedOptions = typeof element.attr('data-selected-options') === 'string' ? JSON.parse(element.attr('data-selected-options')) : JSON.parse(null);
112112
113113
var select2AjaxFetchSelectedEntry = function (element) {
114114
return new Promise(function (resolve, reject) {

src/resources/views/crud/fields/select2_from_ajax_multiple.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ function bpFieldInitSelect2FromAjaxMultipleElement(element) {
9292
var $allowClear = element.attr('data-column-nullable') == 'true' ? true : false;
9393
var $dependencies = JSON.parse(element.attr('data-dependencies'));
9494
var $ajaxDelay = element.attr('data-ajax-delay');
95-
var $selectedOptions = JSON.parse(element.attr('data-selected-options') ? element.attr('data-selected-options') : []);
95+
var $selectedOptions = typeof element.attr('data-selected-options') === 'string' ? JSON.parse(element.attr('data-selected-options')) : JSON.parse("[]");
9696
9797
var select2AjaxMultipleFetchSelectedEntries = function (element) {
9898
return new Promise(function (resolve, reject) {

0 commit comments

Comments
 (0)