|
59 | 59 | 'multiple' => true, |
60 | 60 | ]); |
61 | 61 | } else { |
62 | | - $allowed_itemtypes = !empty($field->fields['allowed_values']) |
63 | | - ? json_decode($field->fields['allowed_values']) |
64 | | - : []; |
| 62 | + $allowed_itemtypes = empty($field->fields['allowed_values']) |
| 63 | + ? [] |
| 64 | + : json_decode((string) $field->fields['allowed_values']); |
65 | 65 | echo implode( |
66 | 66 | ', ', |
67 | 67 | array_map( |
|
72 | 72 | ), |
73 | 73 | ); |
74 | 74 | } |
| 75 | + |
75 | 76 | echo '</td>'; |
76 | 77 | } else { |
77 | 78 | $dropdown_matches = []; |
78 | | - $is_dropdown = $type == 'dropdown' || preg_match('/^dropdown-(?<class>.+)$/', $type, $dropdown_matches) === 1; |
| 79 | + $is_dropdown = $type == 'dropdown' || preg_match('/^dropdown-(?<class>.+)$/', (string) $type, $dropdown_matches) === 1; |
79 | 80 | $is_dropdown_multi = ($is_dropdown && ($type != 'dropdown-Document')); |
80 | 81 |
|
81 | 82 | // Display "default value(s)" field |
|
84 | 85 | echo __('Multiple dropdown', 'fields') . ' :'; |
85 | 86 | echo '<br />'; |
86 | 87 | } |
| 88 | + |
87 | 89 | echo __('Default value', 'fields') . ' :'; |
88 | 90 | if (in_array($type, ['date', 'datetime'])) { |
89 | 91 | echo '<i class="pointer fa fa-info" title="' . __s("You can use 'now' for date and datetime field") . '"></i>'; |
90 | 92 | } |
| 93 | + |
91 | 94 | echo '</td>'; |
92 | 95 |
|
93 | 96 | echo '<td>'; |
|
107 | 110 | } else { |
108 | 111 | echo Dropdown::getYesNo($multiple); |
109 | 112 | } |
| 113 | + |
110 | 114 | echo '<br />'; |
111 | 115 | } else { |
112 | 116 | $multiple = false; |
|
119 | 123 | if (!$multiple) { |
120 | 124 | echo '<input type="hidden" name="default_value" value="" />'; |
121 | 125 | } |
| 126 | + |
122 | 127 | echo '</em>'; |
123 | 128 | } else { |
124 | 129 | $itemtype = $type == 'dropdown' |
|
127 | 132 | if ($field->fields['default_value'] === null) { |
128 | 133 | $field->fields['default_value'] = ''; |
129 | 134 | } |
| 135 | + |
130 | 136 | $default_value = $multiple ? json_decode($field->fields['default_value']) : $field->fields['default_value']; |
131 | 137 | Dropdown::show( |
132 | 138 | $itemtype, |
|
139 | 145 | ], |
140 | 146 | ); |
141 | 147 | } |
| 148 | + |
142 | 149 | echo '</div>'; |
143 | 150 | Ajax::updateItemOnSelectEvent( |
144 | | - "dropdown_multiple$rand", |
145 | | - "plugin_fields_specific_fields_$rand", |
| 151 | + 'dropdown_multiple' . $rand, |
| 152 | + 'plugin_fields_specific_fields_' . $rand, |
146 | 153 | '../ajax/field_specific_fields.php', |
147 | 154 | [ |
148 | 155 | 'id' => $id, |
|
159 | 166 | ], |
160 | 167 | ); |
161 | 168 | } |
| 169 | + |
162 | 170 | echo '</td>'; |
163 | 171 | } |
0 commit comments