Berechtigungen für Produktiovität als eigene Kategorie …

und die bisherigen Produktivitäts-Rechte und E-Mail-Journal-Rechte
darunter anzeigen.

diff --git a/locale/de/all b/locale/de/all
index 8a63356951997e4d429c0eb1e570060055f245f1..b65e8a5afe349143559eb37a6aaea39dac201204 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2529,6 +2529,7 @@ $self->{texts} = {
   'Production'                  => 'Produktion',
   'Production (typeabbreviation)' => 'P',
   'Productivity'                => 'Produktivität',
+  'Productivity (TODO list, Follow-Ups)' => 'Produktivität (Aufgabenliste, Wiedervorlagen)',
   'Profit'                      => 'Gewinn',
   'Profit and loss accounts'    => 'Erfolgskonten',
   'Profit carried forward account' => 'Gewinnvortragskonto',

diff --git a/locale/en/all b/locale/en/all
index dc0ce52222853ada66f1e676ac20b6d57c666b3e..b8779335f6e76e376f9fa98e0bfdb5cefcd6474f 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -2529,6 +2529,7 @@ $self->{texts} = {
   'Production'                  => 'Production',
   'Production (typeabbreviation)' => 'W',
   'Productivity'                => '',
+  'Productivity (TODO list, Follow-Ups)' => '',
   'Profit'                      => '',
   'Profit and loss accounts'    => '',
   'Profit carried forward account' => '',

diff --git a/sql/Pg-upgrade2-auth/right_productivity_as_category.sql b/sql/Pg-upgrade2-auth/right_productivity_as_category.sql
new file mode 100644 (file)
index 0000000..3f161fc
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/right_productivity_as_category.sql
@@ -0,0 +1,26 @@
+-- @tag: right_productivity_as_category
+-- @description: Rechte: Produktivität als eigene Kategorie
+-- @depends: master_rights_positions_fix
+-- @locales: Productivity (TODO list, Follow-Ups)
+
+-- make space before 'configuration'
+UPDATE auth.master_rights SET position = position+1000
+  WHERE position >= (SELECT position FROM auth.master_rights WHERE name LIKE 'configuration');
+
+-- insert category for productivity before 'configuration'
+INSERT INTO auth.master_rights (position, name, description, category)
+  VALUES ((SELECT position FROM auth.master_rights WHERE name LIKE 'configuration') - 1000,
+          'productivity_category',
+          'Productivity',
+          TRUE);
+
+-- move productivity rights below 'productivity_category'
+UPDATE auth.master_rights SET position    = (SELECT position FROM auth.master_rights WHERE name LIKE 'productivity_category') + 100,
+                              description = 'Productivity (TODO list, Follow-Ups)'
+  WHERE name LIKE 'productivity';
+
+UPDATE auth.master_rights SET position = (SELECT position FROM auth.master_rights WHERE name LIKE 'productivity_category') + 200
+  WHERE name LIKE 'email_journal';
+
+UPDATE auth.master_rights SET position = (SELECT position FROM auth.master_rights WHERE name LIKE 'productivity_category') + 250
+  WHERE name LIKE 'email_employee_readall';