From 4f41653c6685013b64c65f5057a89a87f5e93d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ses=C3=B3stris=20Vieira?= <sesostrisvieira@gmail.com>
Date: Thu, 17 Sep 2026 10:14:46 -0300
Subject: [PATCH] Garante que views/edits acessados a partir de um inline
 retorne para o objeto principal. Gertiq #237736

---
 sigi/templates/admin/edit_inline/stacked.html |  68 +++++++++++
 sigi/templates/admin/edit_inline/tabular.html | 109 ++++++++++++++++++
 2 files changed, 177 insertions(+)
 create mode 100644 sigi/templates/admin/edit_inline/stacked.html
 create mode 100644 sigi/templates/admin/edit_inline/tabular.html

diff --git a/sigi/templates/admin/edit_inline/stacked.html b/sigi/templates/admin/edit_inline/stacked.html
new file mode 100644
index 0000000..9312723
--- /dev/null
+++ b/sigi/templates/admin/edit_inline/stacked.html
@@ -0,0 +1,68 @@
+{% load i18n admin_urls djbs_extras %}
+<div class="card shadow-sm {% if djbs.INLINESET_STYLE == djbsc.STYLE_CARD %} mb-3{% elif djbs.INLINESET_STYLE == djbsc.STYLE_TAB %} tab-pane fade{% if forloop.first and djbs.FIELDSET_STYLE != djbs.INLINESET_STYLE %} show active{% endif %}{% elif djbs.INLINESET_STYLE == djbsc.STYLE_ACCORDION %} accordion-item{% endif %} js-inline-admin-formset inline-group"
+     id="{{ inline_admin_formset.formset.prefix }}-group"
+     data-inline-type="stacked"
+     data-inline-formset="{{ inline_admin_formset.inline_formset_data }}">
+  {% if djbs.INLINESET_STYLE == djbsc.STYLE_CARD or djbs.INLINESET_STYLE == djbsc.STYLE_ACCORDION %}
+    <h6 class="{{ djbs.INLINESET_STYLE }}-header">
+      {% if djbs.INLINESET_STYLE == "accordion" %}<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#{{ inline_admin_formset.formset.prefix }}-collapse" {% if forloop.first and djbs.FIELDSET_STYLE != djbs.INLINESET_STYLE %}aria-expanded="true" {% endif %} aria-controls="{{ inline_admin_formset.formset.prefix }}-collapse">{% endif %}
+      {% if inline_admin_formset.formset.max_num == 1 %}
+        {{ inline_admin_formset.opts.verbose_name|upper }}
+      {% else %}
+        {{ inline_admin_formset.opts.verbose_name_plural|upper }}
+      {% endif %}
+      {% if djbs.INLINESET_STYLE == "accordion" %}</button>{% endif %}
+    </h6>
+  {% endif %}
+  <div id="{{ inline_admin_formset.formset.prefix }}-collapse" class="card-body {% if djbs.INLINESET_STYLE == djbsc.STYLE_ACCORDION %}accordion-collapse collapse{% if forloop.first and djbs.FIELDSET_STYLE != djbs.INLINESET_STYLE %} show active{% endif %}{% endif %} tabular inline-related {% if forloop.last %}last-related{% endif %}"{% if djbs.INLINESET_STYLE == djbsc.STYLE_ACCORDION %}  data-bs-parent="#fieldsetAccordion"{% endif %}>
+    <fieldset class="{% if djbs.INLINESET_STYLE == djbsc.STYLE_ACCORDION %}accordion-body{% endif %} module {{ inline_admin_formset.classes }}" aria-labelledby="{{ inline_admin_formset.formset.prefix }}-heading"{% if djbs.INLINESET_STYLE == djbsc.STYLE_ACCORDION %} data-bs-parent="#fieldsetAccordion"{% endif %}>
+      {{ inline_admin_formset.formset.management_form }}
+      {{ inline_admin_formset.formset.non_form_errors }}
+      <div class="row row-cols-1 row-cols-md-{% firstof inline_admin_formset.opts.stacked_cols djbs.STACKED_COLS 2 %} g-2">
+        {% for inline_admin_form in inline_admin_formset %}
+          <div class="col inline-related{% if inline_admin_form.original or inline_admin_form.show_url %} has_original{% endif %}{% if forloop.last and inline_admin_formset.has_add_permission %} empty-form last-related{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-{% if forloop.last and inline_admin_formset.has_add_permission %}empty{% else %}{{ forloop.counter0 }}{% endif %}">
+            <div class="card">
+              <div class="card-body">
+                <h5 class="card-title d-flex">
+                  {% if inline_admin_form.original %}
+                    <span class="inline_label me-auto">{{ inline_admin_form.original }}</span>
+                    {% if inline_admin_form.model_admin.show_change_link and inline_admin_form.model_admin.has_registered_model %}
+                      {% with link_label=inline_admin_formset.has_change_permission|yesno:_("Change,View") link_icon=inline_admin_formset.has_change_permission|yesno:"edit,show" %}
+                        {% if inline_admin_formset.formset.instance.pk %}
+                          {% url opts|admin_urlname:'change' inline_admin_formset.formset.instance.pk as return_url %}
+                          {% add_preserved_filters return_url as return_url %}
+                        {% endif %}
+                        <a href="{% url inline_admin_form.model_admin.opts|admin_urlname:'change' inline_admin_form.original.pk|admin_urlquote %}{% if return_url %}?_return={{ return_url|urlencode }}{% endif %}" class="{{ inline_admin_formset.has_change_permission|yesno:'inlinechangelink,inlineviewlink' }}" data-bs-toggle="tooltip" data-bs-title="{{ link_label }}" aria-label="{{ link_label }}">
+                          {% icon link_icon %}
+                        </a>
+                      {% endwith %}
+                    {% endif %}
+                  {% else %}
+                    <span class="inline_label me-auto">#{{ forloop.counter }}</span>
+                  {% endif %}
+                  {% if inline_admin_form.show_url %}
+                    <a href="{{ inline_admin_form.absolute_url }}" arial-label="{% translate "View on site" %}" data-bs-toggle="tooltip" data-bs-title="{% translate "View on site" %}">{% icon "link" %}</a>
+                  {% endif %}
+                  {% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission and inline_admin_form.original %}
+                    <span class="delete form-check form-switch">
+                      {{ inline_admin_form.deletion_field.field }}
+                    </span>
+                  {% endif %}
+                </h5>
+                {% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %}
+                {% with parent_counter=forloop.counter0 %}
+                  {% for fieldset in inline_admin_form %}
+                    {% include "admin/includes/fieldset_strict.html" with heading_level=4 id_prefix=parent_counter id_suffix=forloop.counter0 %}
+                  {% endfor %}
+                {% endwith %}
+                {% if inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
+                {% if inline_admin_form.fk_field %}{{ inline_admin_form.fk_field.field }}{% endif %}
+              </div>
+            </div>
+          </div>
+        {% endfor %}
+      </div>
+      {% if inline_admin_formset.is_collapsible %}</details>{% endif %}
+    </fieldset>
+  </div>
+</div>
diff --git a/sigi/templates/admin/edit_inline/tabular.html b/sigi/templates/admin/edit_inline/tabular.html
new file mode 100644
index 0000000..17ff10d
--- /dev/null
+++ b/sigi/templates/admin/edit_inline/tabular.html
@@ -0,0 +1,109 @@
+{% load i18n admin_urls static admin_modify djbs_extras %}
+<div class="card shadow-sm{% if djbs.INLINESET_STYLE == djbsc.STYLE_CARD %} mb-3{% elif djbs.INLINESET_STYLE == djbsc.STYLE_TAB %} tab-pane fade{% if forloop.first and djbs.FIELDSET_STYLE != djbs.INLINESET_STYLE %} show active{% endif %}{% elif djbs.INLINESET_STYLE == djbsc.STYLE_ACCORDION %} accordion-item{% endif %} js-inline-admin-formset inline-group" id="{{ inline_admin_formset.formset.prefix }}-group" data-inline-type="tabular" data-inline-formset="{{ inline_admin_formset.inline_formset_data }}">
+  {% if djbs.INLINESET_STYLE == djbsc.STYLE_CARD or djbs.INLINESET_STYLE == djbsc.STYLE_ACCORDION %}
+    <h6 class="{{ djbs.INLINESET_STYLE }}-header">
+      {% if djbs.INLINESET_STYLE == "accordion" %}<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#{{ inline_admin_formset.formset.prefix }}-collapse" {% if forloop.first and djbs.FIELDSET_STYLE != djbs.INLINESET_STYLE %}aria-expanded="true" {% endif %} aria-controls="{{ inline_admin_formset.formset.prefix }}-collapse">{% endif %}
+      {% if inline_admin_formset.formset.max_num == 1 %}
+        {{ inline_admin_formset.opts.verbose_name|upper }}
+      {% else %}
+        {{ inline_admin_formset.opts.verbose_name_plural|upper }}
+      {% endif %}
+      {% if djbs.INLINESET_STYLE == "accordion" %}</button>{% endif %}
+    </h6>
+  {% endif %}
+  <div id="{{ inline_admin_formset.formset.prefix }}-collapse" class="card-body {% if djbs.INLINESET_STYLE == djbsc.STYLE_ACCORDION %}accordion-collapse collapse{% if forloop.first and djbs.FIELDSET_STYLE != djbs.INLINESET_STYLE %} show active{% endif %}{% endif %} tabular inline-related {% if forloop.last %}last-related{% endif %}"{% if djbs.INLINESET_STYLE == djbsc.STYLE_ACCORDION %} data-bs-parent="#fieldsetAccordion"{% endif %}>
+    {{ inline_admin_formset.formset.management_form }}
+    <fieldset class="{% if djbs.INLINESET_STYLE == djbsc.STYLE_ACCORDION %}accordion-body{% endif %} module {{ inline_admin_formset.classes }}">
+      {{ inline_admin_formset.formset.non_form_errors }}
+      <div class="table-responsive">
+        <table class="table table-hover">
+          <thead>
+            <tr>
+              <th class="original"></th>
+              {% for field in inline_admin_formset.fields %}
+                <th class="column-{{ field.name }}{% if field.required %} required{% endif %}{% if field.widget.is_hidden %} d-none hidden{% endif %}">
+                  {{ field.label|capfirst }}
+                  {% if field.help_text %}
+                    {% icon "help" "text-info-emphasis ms-3 help help-tooltip" data_bs_toggle='tooltip' data_bs_title=field.help_text|striptags %}
+                  {% endif %}
+                </th>
+              {% endfor %}
+              {% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission %}
+                <th><span class="float-end">{%icon "delete" data_bs_toggle='tooltip' data_bs_title=_('Delete?') %}</span></th>
+              {% endif %}
+            </tr>
+          </thead>
+          <tbody>
+            {% for inline_admin_form in inline_admin_formset %}
+              {% if inline_admin_form.form.non_field_errors %}
+                <tr class="row-form-errors">
+                  <td colspan="{{ inline_admin_form|cell_count }}">
+                    {{ inline_admin_form.form.non_field_errors }}
+                  </td>
+                </tr>
+              {% endif %}
+              <tr class="form-row {% if inline_admin_form.original or inline_admin_form.show_url %}has_original{% endif %}{% if forloop.last and inline_admin_formset.has_add_permission %} empty-form{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-{% if forloop.last and inline_admin_formset.has_add_permission %}empty{% else %}{{ forloop.counter0 }}{% endif %}">
+                <td class="original">
+                  {% if inline_admin_form.original or inline_admin_form.show_url %}
+                    <p class="d-flex gap-1">
+                      {% if inline_admin_form.original %}
+                        {% if not inline_admin_formset.opts.hide_original|default:djbs.HIDE_ORIGINAL %}
+                          <span class="me-auto">{{ inline_admin_form.original }}</span>
+                        {% endif %}
+                        {% if inline_admin_form.model_admin.show_change_link and inline_admin_form.model_admin.has_registered_model %}
+                          {% with link_label=inline_admin_formset.has_change_permission|yesno:_("Change,View") link_icon=inline_admin_formset.has_change_permission|yesno:"edit,show" %}
+                            {% if inline_admin_formset.formset.instance.pk %}
+                              {% url opts|admin_urlname:'change' inline_admin_formset.formset.instance.pk as return_url %}
+                              {% add_preserved_filters return_url as return_url %}
+                            {% endif %}
+                            <a href="{% url inline_admin_form.model_admin.opts|admin_urlname:'change' inline_admin_form.original.pk|admin_urlquote %}{% if return_url %}?_return={{ return_url|urlencode }}{% endif %}" class="{{ inline_admin_formset.has_change_permission|yesno:'inlinechangelink,inlineviewlink' }}" data-bs-toggle="tooltip" data-bs-title="{{ link_label }}" aria-label="{{ link_label }}">
+                              {% icon link_icon %}
+                            </a>
+                          {% endwith %}
+                        {% endif %}
+                      {% endif %}
+                      {% if inline_admin_form.show_url %}
+                        <a href="{{ inline_admin_form.absolute_url }}" data-bs-toggle="tooltip" data-bs-title="{% translate "View on site" %}" aria-label="{% translate "View on site" %}">
+                          {% icon "viewsite" %}
+                        </a>
+                      {% endif %}
+                    </p>
+                  {% endif %}
+                  {% if inline_admin_form.needs_explicit_pk_field %}
+                    {{ inline_admin_form.pk_field.field }}
+                  {% endif %}
+                  {% if inline_admin_form.fk_field %}
+                    {{ inline_admin_form.fk_field.field }}
+                  {% endif %}
+                </td>
+                {% for fieldset in inline_admin_form %}
+                  {% for line in fieldset %}
+                    {% for field in line %}
+                      <td class="{% if field.field.name %}field-{{ field.field.name }}{% endif %}{% if field.field.is_hidden %} d-none hidden{% endif %}">
+                        {% if field.is_readonly %}
+                          <p>{{ field.contents }}</p>
+                        {% else %}
+                          {{ field.field.errors.as_ul }}
+                          {{ field.field }}
+                        {% endif %}
+                      </td>
+                    {% endfor %}
+                  {% endfor %}
+                {% endfor %}
+                {% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission %}
+                  <td class="delete">
+                    {% if inline_admin_form.original %}
+                      <span class="delete form-check form-switch float-end">
+                        {{ inline_admin_form.deletion_field.field }}
+                      </span>
+                    {% endif %}
+                  </td>
+                {% endif %}
+              </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      </div>
+    </fieldset>
+  </div>
+</div>
\ No newline at end of file