Bugzilla – Attachment 139004 Details for
Bug 29723
Add a "Configure table" button for KohaTable tables
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 29723: (QA follow-up) Switch to using ID's on column settings
Bug-29723-QA-follow-up-Switch-to-using-IDs-on-colu.patch (text/plain), 14.15 KB, created by
Jonathan Druart
on 2022-08-10 14:46:56 UTC
(
hide
)
Description:
Bug 29723: (QA follow-up) Switch to using ID's on column settings
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2022-08-10 14:46:56 UTC
Size:
14.15 KB
patch
obsolete
>From 5aeb523ad2d706c4d0e32523f4fc7cfc3b024be8 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Wed, 10 Aug 2022 11:27:18 +0100 >Subject: [PATCH] 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> >--- > admin/columns_settings.pl | 2 +- > .../prog/en/modules/admin/columns_settings.tt | 35 +++++++++---------- > 2 files changed, 17 insertions(+), 20 deletions(-) > >diff --git a/admin/columns_settings.pl b/admin/columns_settings.pl >index 4d040e96a12..994070caf97 100755 >--- a/admin/columns_settings.pl >+++ b/admin/columns_settings.pl >@@ -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, > ); > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >index 1a023396358..3c3e3a6e0c4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >@@ -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 -%] >-- >2.25.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 29723
:
128648
|
131874
|
133029
|
138951
|
138952
|
138972
|
138973
|
138974
|
138975
|
138985
|
138986
|
138987
|
138988
|
138989
|
138992
|
138993
|
138994
|
138995
|
138996
|
138997
|
138998
|
138999
|
139000
|
139002
|
139003
| 139004 |
139005
|
139006
|
139194