Attachment 77571 Details for Bug 20248 – Bug 20248: (QA follow-up) Remove unnecessary stuff

[patch] Bug 20248: (QA follow-up) Remove unnecessary stuff

Bug-20248-QA-follow-up-Remove-unnecessary-stuff.patch (text/plain), 3.33 KB, created by Julian Maurice on 2018-08-08 12:38:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2018-08-08 12:38:54 UTC

Size: 3.33 KB

patch

obsolete

>From 36fae3a4dbd776a6670f7b2a14ea363af91ed44c Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Wed, 8 Aug 2018 14:33:11 +0200
>Subject: [PATCH] Bug 20248: (QA follow-up) Remove unnecessary stuff
>
>- Remove useless 'action' attribute in forms
>- $op should never be equal to 'reset', so remove the test
>- Move 'op' parameter inside <button>s to avoid having different HTML
>  tags for elements that have the same kind of behaviour
>
>Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
>---
> admin/searchengine/elasticsearch/mappings.pl             | 2 +-
> .../modules/admin/searchengine/elasticsearch/mappings.tt | 9 ++++-----
> 2 files changed, 5 insertions(+), 6 deletions(-)
>
>diff --git a/admin/searchengine/elasticsearch/mappings.pl b/admin/searchengine/elasticsearch/mappings.pl
>index 12219d3356..ecd8741533 100755
>--- a/admin/searchengine/elasticsearch/mappings.pl
>+++ b/admin/searchengine/elasticsearch/mappings.pl
>@@ -97,7 +97,7 @@ if ( $op eq 'edit' ) {
>         $schema->storage->txn_commit;
>     }
> }
>-elsif( $op eq 'reset' || $op eq 'reset_confirmed' ) {
>+elsif( $op eq 'reset_confirmed' ) {
>     Koha::SearchMarcMaps->delete;
>     Koha::SearchFields->delete;
>     Koha::SearchEngine::Elasticsearch->reset_elasticsearch_mappings;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>index b72378e29a..f3bc552985 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>@@ -113,18 +113,17 @@ a.add, a.delete {
>     [% IF reset_confirm %]
>         <div class="dialog alert">
>             <h3>The current mappings you see on the screen will be erased and replaced by the mappings in the mappings.yaml file.</h3>
>-            <form action="?" method="post">
>+            <form method="post">
>                 <input type="hidden" name="op" value="reset_confirmed" />
>                 <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, reset mappings</button>
>             </form>
>             <br>
>-            <form action="?" method="post">
>+            <form method="post">
>                 <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not reset mappings</button>
>             </form>
>         </div>
>     [% END %]
>     <form method="post">
>-        <input type="hidden" name="op" value="edit" />
>         <div id="tabs" class="toptabs" style="clear:both">
>             <ul>
>                 <li><a href="#search_fields">Search fields</a></li>
>@@ -313,8 +312,8 @@ a.add, a.delete {
>             [% END %]
>         </div>
>         <p>
>-            <button class="btn btn-default" type="submit"><i class="fa fa-hdd-o" aria-hidden="true"></i> Save</button>
>-            <a class="btn btn-default" href="?op=reset_confirm"><i class="fa fa-refresh" aria-hidden="true"></i> Reset Mappings</a>
>+            <button class="btn btn-default" type="submit" name="op" value="edit"><i class="fa fa-hdd-o" aria-hidden="true"></i> Save</button>
>+            <button class="btn btn-default" type="submit" name="op" value="reset_confirm"><i class="fa fa-refresh" aria-hidden="true"></i> Reset Mappings</button>
>         </p>
>     </form>
> </div>
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 20248: 71954 | 72801 | 72861 | 72907 | 72921 | 72922 | 72932 | 72933 | 73374 | 73796 | 73798 | 77570 | 77571 | 77572 | 77573