gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 29723: (QA follow-up) Switch to using ID's on column settings 

This patch updates the column settings page to use ID's instead of
Indexes to restor the open accordian card after a setting change.

Test plan
1 Go to Administration -> Table settings.
2 All panels should be collapsed.
3 Test expanding and collapsing panels to confirm it's working
  correctly.
4 Make a change to one of the table configurations. After clicking
  "Save" the page should reload with the same panel expanded.

Signed-off-by: Andrew <andrewfh@dubcolib.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Martin Renvoize 2022-08-10 11:27:18 +01:00 committed by Tomas Cohen Arazi
parent ebf1ad39f8
commit c8c8ef9d2e
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/columns_settings.pl
View File

@ -74,7 +74,7 @@ if ( $action eq 'save' ) {
if ( $action eq 'list' ) {
my $modules = C4::Utils::DataTables::TablesSettings::get_modules;
$template->param(
panel => defined $input->param('panel') ? $input->param('panel') : undef,
panel => defined $input->param('module') ? $input->param('module') : undef,
modules => $modules,
);
}

35
koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
View File

@ -2,7 +2,6 @@
[% USE Asset %]
[% USE TablesSettings %]
[% SET footerjs = 1 %]
[% SET panel_id = 0 %]
[% BLOCK pagelist %]
[% IF module.keys and module.keys.size > 0 %]
<span>Jump to:</span>
@ -15,8 +14,6 @@
<form method="post" action="/cgi-bin/koha/admin/columns_settings.pl">
<input type="hidden" name="action" value="save" />
<input type="hidden" name="module" value="[% modulename | html %]" />
<input type="hidden" name="panel" value="[% panel_id | html %]" />
[% SET panel_id = panel_id + 1 %]
[% IF module.keys and module.keys.size > 0 %]
[% FOR pagename IN module.keys.sort %]
<h4 class="page_name" id="[% pagename | html %]">Page: [% pagename | html %]</h4>
@ -205,7 +202,7 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="acquiHeading">
<h2 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#acqui" aria-expanded="false" aria-controls="collapseOne">
<a id="acquiToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#acqui" aria-expanded="false" aria-controls="collapseOne">
Acquisition
</a>
</h2>
@ -221,7 +218,7 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="adminHeading">
<h2 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#admin" aria-expanded="false" aria-controls="collapseOne">
<a id="adminToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#admin" aria-expanded="false" aria-controls="collapseOne">
Administration
</a>
</h2>
@ -237,7 +234,7 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="authoritiesHeading">
<h2 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#authorities" aria-expanded="false" aria-controls="collapseOne">
<a id="authoritiesToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#authorities" aria-expanded="false" aria-controls="collapseOne">
Authorities
</a>
</h2>
@ -253,7 +250,7 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="catalogueHeading">
<h2 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#catalogue" aria-expanded="false" aria-controls="collapseOne">
<a id="catalogueToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#catalogue" aria-expanded="false" aria-controls="collapseOne">
Catalog
</a>
</h2>
@ -269,7 +266,7 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="cataloguingHeading">
<h2 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#cataloguing" aria-expanded="false" aria-controls="collapseOne">
<a id="cataloguingToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#cataloguing" aria-expanded="false" aria-controls="collapseOne">
Cataloging
</a>
</h2>
@ -285,7 +282,7 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="circulationHeading">
<h2 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#circulation" aria-expanded="false" aria-controls="collapseOne">
<a id="circulationToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#circulation" aria-expanded="false" aria-controls="collapseOne">
Circulation
</a>
</h2>
@ -301,7 +298,7 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="coursereservesHeading">
<h2 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#coursereserves" aria-expanded="false" aria-controls="collapseOne">
<a id="coursereservesToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#coursereserves" aria-expanded="false" aria-controls="collapseOne">
Course reserves
</a>
</h2>
@ -317,7 +314,7 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="illHeading">
<h2 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#ill" aria-expanded="false" aria-controls="collapseOne">
<a id="illToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#ill" aria-expanded="false" aria-controls="collapseOne">
Interlibrary loans
</a>
</h2>
@ -333,7 +330,7 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="membersHeading">
<h2 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#members" aria-expanded="false" aria-controls="collapseOne">
<a id="membersToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#members" aria-expanded="false" aria-controls="collapseOne">
Patrons
</a>
</h2>
@ -349,7 +346,7 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="posHeading">
<h2 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#pos" aria-expanded="false" aria-controls="collapseOne">
<a id="posToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#pos" aria-expanded="false" aria-controls="collapseOne">
Point of sale
</a>
</h2>
@ -365,7 +362,7 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="toolsHeading">
<h2 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#tools" aria-expanded="false" aria-controls="collapseOne">
<a id="toolsToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#tools" aria-expanded="false" aria-controls="collapseOne">
Tools
</a>
</h2>
@ -381,7 +378,7 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="opacHeading">
<h2 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#opac" aria-expanded="false" aria-controls="collapseOne">
<a id="opacToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#opac" aria-expanded="false" aria-controls="collapseOne">
OPAC
</a>
</h2>
@ -397,7 +394,7 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="reportsHeading">
<h2 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#reports" aria-expanded="false" aria-controls="collapseOne">
<a id="reportsToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#reports" aria-expanded="false" aria-controls="collapseOne">
Reports
</a>
</h2>
@ -413,7 +410,7 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="serialsHeading">
<h2 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#serials" aria-expanded="false" aria-controls="collapseOne">
<a id="serialsToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#serials" aria-expanded="false" aria-controls="collapseOne">
Serials
</a>
</h2>
@ -440,10 +437,10 @@
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/admin-menu.js") | $raw %]
[%- IF ( panel.defined && panel >= 0 ) -%]
[%- IF ( panel.defined ) -%]
<script>
$(document).ready( function() {
$("#modules a.collapsed:eq(" + Number( [% panel | html %] ) + ")").click();
$("#[% panel | uri %]Toggle").click();
});
</script>
[%- END -%]