From 249c0c6f38350cc67eb2304538aa4ef7f329eb79 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= <bernd@kivitendo-premium.de>
Date: Mon, 14 Dec 2020 17:45:22 +0100
Subject: [PATCH] =?utf8?q?Berechtigungen=20f=C3=BCr=20Produktiovit=C3=A4t?=
 =?utf8?q?=20als=20eigene=20Kategorie=20=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

und die bisherigen Produktivitäts-Rechte und E-Mail-Journal-Rechte
darunter anzeigen.
---
 locale/de/all                                 |  1 +
 locale/en/all                                 |  1 +
 .../right_productivity_as_category.sql        | 26 +++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 sql/Pg-upgrade2-auth/right_productivity_as_category.sql

diff --git a/locale/de/all b/locale/de/all
index 8a6335695..b65e8a5af 100755
--- 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 dc0ce5222..b8779335f 100644
--- 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
index 000000000..3f161fca5
--- /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';
-- 
2.20.1