Attachment 45308 Details for Bug 15099 – Bug 15099: Move admin/categorie.pl to admin/categories.pl

[patch] Bug 15099: Move admin/categorie.pl to admin/categories.pl

Bug-15099-Move-admincategoriepl-to-admincategories.patch (text/plain), 14.06 KB, created by Jonathan Druart on 2015-12-02 08:55:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-12-02 08:55:14 UTC

Size: 14.06 KB

patch

obsolete

>From 9d4e5d3cc1c960e257922f76a6abde541d354b8d Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 2 Dec 2015 08:49:50 +0000
>Subject: [PATCH] Bug 15099: Move admin/categorie.pl to admin/categories.pl
>
>This patch fixes the filename categorie.pl correcting it by categories.pl
>The plurial is usually used for script names in the admin module.
>
>Test plan:
>Navigate to the patron categories page.
>Confirm that the admin/categorie.pl url still works (you need to apply
>the change to the apache config before).
>---
> C4/Form/MessagingPreferences.pm                    |  2 +-
> admin/{categorie.pl => categories.pl}              |  2 +-
> debian/templates/apache-shared-intranet.conf       |  1 +
> etc/koha-httpd.conf                                |  1 +
> .../intranet-tmpl/prog/en/includes/admin-menu.inc  |  2 +-
> .../prog/en/modules/admin/admin-home.tt            |  2 +-
> .../modules/admin/{categorie.tt => categories.tt}  | 22 +++++++++++-----------
> .../prog/en/modules/members/member.tt              |  2 +-
> .../prog/en/modules/members/memberentrygen.tt      |  2 +-
> .../prog/en/modules/tools/overduerules.tt          |  2 +-
> 10 files changed, 20 insertions(+), 18 deletions(-)
> rename admin/{categorie.pl => categories.pl} (99%)
> rename koha-tmpl/intranet-tmpl/prog/en/modules/admin/{categorie.tt => categories.tt} (95%)
>
>diff --git a/C4/Form/MessagingPreferences.pm b/C4/Form/MessagingPreferences.pm
>index bb981a6..cbee804 100644
>--- a/C4/Form/MessagingPreferences.pm
>+++ b/C4/Form/MessagingPreferences.pm
>@@ -163,7 +163,7 @@ sub set_form_values {
> 
> =head1 SEE ALSO
> 
>-L<C4::Members::Messaging>, F<admin/categorie.pl>, F<opac/opac-messaging.pl>, F<members/messaging.pl>
>+L<C4::Members::Messaging>, F<admin/categories.pl>, F<opac/opac-messaging.pl>, F<members/messaging.pl>
> 
> =head1 AUTHOR
> 
>diff --git a/admin/categorie.pl b/admin/categories.pl
>similarity index 99%
>rename from admin/categorie.pl
>rename to admin/categories.pl
>index cc153bd..1370b58 100755
>--- a/admin/categorie.pl
>+++ b/admin/categories.pl
>@@ -39,7 +39,7 @@ my @messages;
> 
> my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
>     {
>-        template_name   => "admin/categorie.tt",
>+        template_name   => "admin/categories.tt",
>         query           => $input,
>         type            => "intranet",
>         authnotrequired => 0,
>diff --git a/debian/templates/apache-shared-intranet.conf b/debian/templates/apache-shared-intranet.conf
>index 04bab25..aa0dc08 100644
>--- a/debian/templates/apache-shared-intranet.conf
>+++ b/debian/templates/apache-shared-intranet.conf
>@@ -17,3 +17,4 @@ RewriteRule (.+) $1?%1%2 [N,R,NE]
> RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/detail\.pl?bib=$1 [PT]
> RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
> RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
>+RewriteRule /cgi-bin/koha/admin/categorie.pl /cgi-bin/koha/admin/categories.pl [PT]
>diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf
>index 32cdf0a..c779176 100644
>--- a/etc/koha-httpd.conf
>+++ b/etc/koha-httpd.conf
>@@ -230,6 +230,7 @@
>      RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/detail\.pl?bib=$1 [PT]
>      RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
>      RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
>+     RewriteRule /cgi-bin/koha/admin/categorie.pl /cgi-bin/koha/admin/categories.pl [PT]
> 
> 
>      # REST API configuration
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
>index e38b0b4..7a8704f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
>@@ -26,7 +26,7 @@
> 
> <h5>Patrons and circulation</h5>
> <ul>
>-	<li><a href="/cgi-bin/koha/admin/categorie.pl">Patron types and categories</a></li>
>+	<li><a href="/cgi-bin/koha/admin/categories.pl">Patron types and categories</a></li>
>     <li><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></li>
> 	<li><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></li>
> 	<li><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>index 885654a..846439d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>@@ -40,7 +40,7 @@
> 
> <h3>Patrons and circulation</h3>
> <dl>
>-	<dt><a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a></dt>
>+	<dt><a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a></dt>
> 	<dd>Define patron categories.</dd>
> [% IF CAN_user_parameters_manage_circ_rules %]
>     <dt><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></dt>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>similarity index 95%
>rename from koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
>rename to koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>index 8d9e436..1e74c1b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>@@ -98,9 +98,9 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'patrons-admin-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF op == 'add_form' %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a> &rsaquo; [% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
>-[% IF op == 'delete_confirm' %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a> &rsaquo; [% IF ( patrons_in_category > 0 ) %]Cannot delete: Category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %]
>-[% IF op == 'delete_confirmed' %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a> &rsaquo; Category deleted[% END %]
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF op == 'add_form' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> &rsaquo; [% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
>+[% IF op == 'delete_confirm' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> &rsaquo; [% IF ( patrons_in_category > 0 ) %]Cannot delete: Category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %]
>+[% IF op == 'delete_confirmed' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> &rsaquo; Category deleted[% END %]
> [% IF op == 'list' %]Patron categories[% END %]</div>
> 
> <div id="doc3" class="yui-t2">
>@@ -133,7 +133,7 @@
> [% END %]
> 
> [% IF op == 'add_form' %]
>-    <form name="Aform" action="/cgi-bin/koha/admin/categorie.pl" method="post">
>+    <form name="Aform" action="/cgi-bin/koha/admin/categories.pl" method="post">
>         <input type="hidden" name="op" value="add_validate" />
>         <input type="hidden" name="checked" value="0" />
>         [% IF category %]
>@@ -304,7 +304,7 @@
> [% END %]
> 
> [% IF op == 'delete_confirm' %]
>-    <form action="/cgi-bin/koha/admin/categorie.pl" method="post">
>+    <form action="/cgi-bin/koha/admin/categories.pl" method="post">
>         <fieldset>
>             <legend>
>                 [% IF patrons_in_category > 0 %]
>@@ -358,7 +358,7 @@
>                     <input type="hidden" name="op" value="delete_confirmed" />
>                     <input type="hidden" name="categorycode" value="[% categorycode |html %]" />
>                     <input type="submit" value="Delete this category" />
>-                    <a class="cancel" href="/cgi-bin/koha/admin/categorie.pl">Cancel</a>
>+                    <a class="cancel" href="/cgi-bin/koha/admin/categories.pl">Cancel</a>
>                 [% END %]
>             </fieldset>
>         </fieldset>
>@@ -368,7 +368,7 @@
> [% IF op == 'list' %]
> 
>     <div id="toolbar" class="btn-toolbar">
>-        <a class="btn btn-small" id="newcategory" href="/cgi-bin/koha/admin/categorie.pl?op=add_form"><i class="fa fa-plus"></i> New category</a>
>+        <a class="btn btn-small" id="newcategory" href="/cgi-bin/koha/admin/categories.pl?op=add_form"><i class="fa fa-plus"></i> New category</a>
>     </div>
> 
>     <h2>Patron category administration</h2>
>@@ -403,7 +403,7 @@
>                     <tr>
>                         <td>[% category.categorycode |html %]</td>
>                         <td>
>-                            <a href="/cgi-bin/koha/admin/categorie.pl?op=add_form&amp;categorycode=[% category.categorycode |uri %]">[% category.description |html %]</a>
>+                            <a href="/cgi-bin/koha/admin/categories.pl?op=add_form&amp;categorycode=[% category.categorycode |uri %]">[% category.description |html %]</a>
>                         </td>
>                         <td>
>                             [% SWITCH category.category_type %]
>@@ -480,14 +480,14 @@
>                                 Forever
>                             [% END %]
>                         </td>
>-                        <td><a href="/cgi-bin/koha/admin/categorie.pl?op=add_form&amp;categorycode=[% category.categorycode |uri %]">Edit</a></td>
>-                        <td><a href="/cgi-bin/koha/admin/categorie.pl?op=delete_confirm&amp;categorycode=[% category.categorycode |uri %]">Delete</a></td>
>+                        <td><a href="/cgi-bin/koha/admin/categories.pl?op=add_form&amp;categorycode=[% category.categorycode |uri %]">Edit</a></td>
>+                        <td><a href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&amp;categorycode=[% category.categorycode |uri %]">Delete</a></td>
>                     </tr>
>                 [% END %]
>             </tbody>
>         </table>
>     [% ELSE %]
>-        <div class="dialog alert">No categories have been defined. <a href="/cgi-bin/koha/admin/categorie.pl?op=add_form">Create a new category</a>.</div>
>+        <div class="dialog alert">No categories have been defined. <a href="/cgi-bin/koha/admin/categories.pl?op=add_form">Create a new category</a>.</div>
>     [% END %]
> [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>index 49971b7..411e8d2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>@@ -321,7 +321,7 @@ function filterByFirstLetterSurname(letter) {
>                 <p>There are <strong>no libraries defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/branches.pl">add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>
>               [% END %]
>               [% IF ( no_categories ) %]
>-                <p>There are <strong>no patron categories defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/categorie.pl">add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.[% END %]</p>
>+                <p>There are <strong>no patron categories defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/categories.pl">add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.[% END %]</p>
>               [% END %]
>             </div>
>           [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>index a3b7a9d..9a47284 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -187,7 +187,7 @@
> 
> 	[% IF ( no_add ) %]<div class="dialog alert"><h3>Cannot add patron</h3>
> 		[% IF ( no_branches ) %]<p>There are <strong>no libraries defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/branches.pl">add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>[% END %]
>-		[% IF ( no_categories ) %]<p>There are <strong>no patron categories defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/categorie.pl">add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.</p>[% END %][% END %]</div>[% END %]
>+		[% IF ( no_categories ) %]<p>There are <strong>no patron categories defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/categories.pl">add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.</p>[% END %][% END %]</div>[% END %]
> 
> 	[% UNLESS ( no_add ) %]
>     <h1>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>index e561859..ed422c7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>@@ -167,7 +167,7 @@ $(document).ready(function() {
>             </form>
>             [% ELSE %]
>                 <div class="warning">You don't have patron categories defined, or the patron categories are not set to receive overdue notices.</div>
>-                <div class="warning">If this is not what you were expecting, go to <a href="../admin/categorie.pl">patron categories</p></div>
>+                <div class="warning">If this is not what you were expecting, go to <a href="../admin/categories.pl">patron categories</p></div>
>             [% END %]
>     </div>
>     </div>
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 15099: 45308 | 45494 | 45495 | 45627 | 46090 | 46094