Skip to content

Commit 9e4dc5b

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #20413 from MoonE/gis-editor-form
Fix Gis editor form in search view
2 parents d510032 + 96d5c68 commit 9e4dc5b

6 files changed

Lines changed: 9 additions & 8 deletions

File tree

‎resources/js/table/change.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ AJAX.registerOnload('table/change.js', function () {
608608
// @ts-ignore
609609
$.datepicker.initialized = false;
610610

611-
const gisEditorModal = document.getElementById('gisEditorModal');
611+
const gisEditorModal = document.querySelector('#gisEditorModal.editor-for-change');
612612
gisEditorModal?.addEventListener('show.bs.modal', event => {
613613
// @ts-ignore
614614
const button = $(event.relatedTarget as HTMLButtonElement);

‎resources/js/table/select.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ AJAX.registerOnload('table/select.js', function () {
266266
}
267267
});
268268

269-
const gisEditorModal = document.getElementById('gisEditorModal');
269+
const gisEditorModal = document.querySelector('#gisEditorModal.editor-for-search');
270270
gisEditorModal?.addEventListener('show.bs.modal', event => {
271271
// @ts-ignore
272272
const button = $(event.relatedTarget as HTMLButtonElement);

‎resources/templates/modals/gis_editor.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="modal fade" id="gisEditorModal" data-bs-backdrop="static" tabindex="-1" aria-labelledby="gisEditorModalLabel" aria-hidden="true">
1+
<div class="modal fade editor-for-{{ location }}" id="gisEditorModal" data-bs-backdrop="static" tabindex="-1" aria-labelledby="gisEditorModalLabel" aria-hidden="true">
22
<div class="modal-dialog modal-dialog-scrollable modal-xl">
33
<div class="modal-content">
44
<div class="modal-header">

‎resources/templates/table/search/index.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@
9191
</tbody>
9292
</table>
9393
</div>
94-
95-
{{ include('modals/gis_editor.twig') }}
9694
</div>
9795

9896
{% if default_sliders_state != 'disabled' %}
@@ -173,6 +171,8 @@
173171
</div>
174172
</form>
175173

174+
{% include 'modals/gis_editor.twig' with { 'location': 'search' } only %}
175+
176176
<div class="modal fade" id="rangeSearchModal" tabindex="-1" aria-labelledby="rangeSearchModalLabel" aria-hidden="false">
177177
<div class="modal-dialog">
178178
<div class="modal-content">

‎resources/templates/table/zoom_search/index.twig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,14 @@
144144
</td>
145145
</tr>
146146
</table>
147-
148-
{{ include('modals/gis_editor.twig') }}
149147
</div>
150148

151149
<div class="card-footer">
152150
<input class="btn btn-primary" type="submit" name="zoom_submit" id="inputFormSubmitId" value="{{ t('Go') }}">
153151
</div>
154152
</div>
155153
</form>
154+
155+
{% include 'modals/gis_editor.twig' with { 'location': 'search' } only %}
156+
156157
<div id="sqlqueryresultsouter"></div>

‎src/Controllers/Table/ChangeController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public function __invoke(ServerRequest $request): Response
276276

277277
$htmlOutput .= '</form>';
278278

279-
$htmlOutput .= $this->template->render('modals/gis_editor');
279+
$htmlOutput .= $this->template->render('modals/gis_editor', ['location' => 'change']);
280280
// end Insert/Edit form
281281

282282
if ($insertMode) {

0 commit comments

Comments
 (0)