From edd70f188098814cf376a5c00f08d6e70521c066 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Mon, 17 Jun 2019 21:50:01 +0000
Subject: [PATCH] Bug 23109: Improve description of staffaccess permission

Changes:
Allow staff members to modify permissions for other staff members
To:
Allow staff members to modify permissions and passwords for other staff members.

As suggested by Andre on the initial bug report.

To test:
- Go to any patron account and check More > permissions
- Veriy the description is shown as noted above
- Apply patch and run database update
- Reload the page and verify the description has changed
- Run the following SQL and verify the description in the
  database table matches as well:

SELECT * FROM userflags where flag = "staffaccess";

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../atomicupdate/bug_23109_improve_staffaccess_description.perl     | 6 ++++++
 installer/data/mysql/userflags.sql                                  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc            | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 installer/data/mysql/atomicupdate/bug_23109_improve_staffaccess_description.perl

diff --git a/installer/data/mysql/atomicupdate/bug_23109_improve_staffaccess_description.perl b/installer/data/mysql/atomicupdate/bug_23109_improve_staffaccess_description.perl
new file mode 100644
index 0000000000..e820a2142f
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_23109_improve_staffaccess_description.perl
@@ -0,0 +1,6 @@
+$DBversion = 'XXX'; # will be replaced by the RM
+if( CheckVersion( $DBversion ) ) {
+    $dbh->do( "UPDATE userflags SET flagdesc = 'Allow staff members to modify permissions and passwords for other staff members' WHERE flag = 'staffaccess'" );
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 23109 - Improve description of staffacess permissiony)\n";
+}
diff --git a/installer/data/mysql/userflags.sql b/installer/data/mysql/userflags.sql
index 68235994c5..7712a9b709 100644
--- a/installer/data/mysql/userflags.sql
+++ b/installer/data/mysql/userflags.sql
@@ -13,7 +13,7 @@ INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES
 (14,'editauthorities','Edit authorities',0),
 (15,'serials','Manage serial subscriptions',0),
 (16,'reports','Allow access to the reports module',0),
-(17,'staffaccess','Allow staff members to modify permissions for other staff members',0),
+(17,'staffaccess','Allow staff members to modify permissions and passwords for other staff members',0),
 (18,'coursereserves','Course reserves',0),
 (19, 'plugins', 'Koha plugins', '0'),
 (20, 'lists', 'Lists', 0),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
index d149cdeb61..9fa6a625a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
@@ -43,7 +43,7 @@
         <span class="main_permission reports_permission">Allow access to the reports module</span>
         <span class="permissioncode">([% name | html %])</span>
     [%- CASE 'staffaccess' -%]
-        <span class="main_permission staffaccess_permission">Allow staff members to modify permissions for other staff members</span>
+        <span class="main_permission staffaccess_permission">Allow staff members to modify permissions and passwords for other staff members</span>
         <span class="permissioncode">([% name | html %])</span>
     [%- CASE 'coursereserves' -%]
         <span class="main_permission coursereserves_permission">Course reserves</span>
-- 
2.11.0