Bugzilla – Attachment 43564 Details for
Bug 13632
Make permission descriptions translatable
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 13632: Populate user_flags and permissions tables in the web installer
PASSED-QA-Bug-13632-Populate-userflags-and-permiss.patch (text/plain), 2.77 KB, created by
Katrin Fischer
on 2015-10-18 10:34:02 UTC
(
hide
)
Description:
[PASSED QA] Bug 13632: Populate user_flags and permissions tables in the web installer
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2015-10-18 10:34:02 UTC
Size:
2.77 KB
patch
obsolete
>From 18d3d690c8846ba6b47b7d3cb883c70e5879c5c9 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 22 Sep 2015 09:50:15 +0100 >Subject: [PATCH] [PASSED QA] Bug 13632: Populate user_flags and permissions > tables in the web installer > >Move the 2 specific 'en' files outside of the language directory. > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > C4/Installer.pm | 2 ++ > installer/data/mysql/en/mandatory/userflags.txt | 1 - > installer/data/mysql/en/mandatory/userpermissions.txt | 1 - > installer/data/mysql/{en/mandatory => }/userflags.sql | 0 > installer/data/mysql/{en/mandatory => }/userpermissions.sql | 0 > 5 files changed, 2 insertions(+), 2 deletions(-) > delete mode 100644 installer/data/mysql/en/mandatory/userflags.txt > delete mode 100644 installer/data/mysql/en/mandatory/userpermissions.txt > rename installer/data/mysql/{en/mandatory => }/userflags.sql (100%) > rename installer/data/mysql/{en/mandatory => }/userpermissions.sql (100%) > >diff --git a/C4/Installer.pm b/C4/Installer.pm >index a4f63a2..d8f7a38 100644 >--- a/C4/Installer.pm >+++ b/C4/Installer.pm >@@ -304,6 +304,8 @@ sub load_sql_in_order { > # Make sure the global sysprefs.sql file is loaded first > my $globalsysprefs = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/sysprefs.sql"; > unshift(@fnames, $globalsysprefs); >+ push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/userflags.sql"; >+ push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/userpermissions.sql"; > foreach my $file (@fnames) { > # warn $file; > undef $/; >diff --git a/installer/data/mysql/en/mandatory/userflags.txt b/installer/data/mysql/en/mandatory/userflags.txt >deleted file mode 100644 >index 5fa8bdd..0000000 >--- a/installer/data/mysql/en/mandatory/userflags.txt >+++ /dev/null >@@ -1 +0,0 @@ >-Default user permissions flags >diff --git a/installer/data/mysql/en/mandatory/userpermissions.txt b/installer/data/mysql/en/mandatory/userpermissions.txt >deleted file mode 100644 >index 59b7ce1..0000000 >--- a/installer/data/mysql/en/mandatory/userpermissions.txt >+++ /dev/null >@@ -1 +0,0 @@ >-Detailed staff user permissions >diff --git a/installer/data/mysql/en/mandatory/userflags.sql b/installer/data/mysql/userflags.sql >similarity index 100% >rename from installer/data/mysql/en/mandatory/userflags.sql >rename to installer/data/mysql/userflags.sql >diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/userpermissions.sql >similarity index 100% >rename from installer/data/mysql/en/mandatory/userpermissions.sql >rename to installer/data/mysql/userpermissions.sql >-- >1.9.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 13632
:
35569
|
35595
|
35761
|
35776
|
42756
|
42757
|
42758
|
42759
|
42760
|
43528
|
43529
|
43530
|
43531
|
43532
|
43561
|
43562
|
43563
| 43564 |
43565
|
43566
|
43599