Revert "Recht für Anzeige der Produktivität"

This reverts commit a27cd427a2689b49a7642884edd2d24555305a4b.

diff --git a/SL/Auth.pm b/SL/Auth.pm
index 23a9771e702d1f0e8065542564988ad1d498fb2a..3ef2660656e758c3dcdc67df10b96b7ada8ec64b 100644 (file)
--- a/SL/Auth.pm
+++ b/SL/Auth.pm
@@ -1060,8 +1060,6 @@ sub all_rights_full {
     ["email_bcc",                      $locale->text("May set the BCC field when sending emails")],
     ["config",                         $locale->text("Change kivitendo installation settings (all menu entries beneath 'System')")],
     ["admin",                          $locale->text("Administration (Used to access instance administration from user logins)")],
     ["email_bcc",                      $locale->text("May set the BCC field when sending emails")],
     ["config",                         $locale->text("Change kivitendo installation settings (all menu entries beneath 'System')")],
     ["admin",                          $locale->text("Administration (Used to access instance administration from user logins)")],

-    ["productivity",                   $locale->text("Productivity")],
-    ["display_admin_link",             $locale->text("Show administration link")],

     );
 
   return @all_rights;
     );
 
   return @all_rights;

diff --git a/bin/mozilla/fu.pl b/bin/mozilla/fu.pl
index ef80a73cd4077919cd11a3c0135f194097cc4ea3..3b5adb230597532b2842b0d675714eef13b4c44a 100644 (file)
--- a/bin/mozilla/fu.pl
+++ b/bin/mozilla/fu.pl
@@ -10,8 +10,6 @@ use strict;
 sub _collect_links {
   $main::lxdebug->enter_sub();
 
 sub _collect_links {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   my $dest = shift;
 
   my $form     = $main::form;
   my $dest = shift;
 
   my $form     = $main::form;


@@ -30,8 +28,6 @@ sub _collect_links {
 sub add {
   $main::lxdebug->enter_sub();
 
 sub add {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;


@@ -61,8 +57,6 @@ sub add {
 sub edit {
   $main::lxdebug->enter_sub();
 
 sub edit {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   my $form     = $main::form;
   my $locale   = $main::locale;
 
   my $form     = $main::form;
   my $locale   = $main::locale;
 


@@ -88,8 +82,6 @@ sub edit {
 sub display_form {
   $main::lxdebug->enter_sub();
 
 sub display_form {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   my $form     = $main::form;
 
   $form->get_lists("employees" => "EMPLOYEES");
   my $form     = $main::form;
 
   $form->get_lists("employees" => "EMPLOYEES");


@@ -110,8 +102,6 @@ sub display_form {
 sub save_follow_up {
   $main::lxdebug->enter_sub();
 
 sub save_follow_up {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   my $form     = $main::form;
   my $locale   = $main::locale;
 
   my $form     = $main::form;
   my $locale   = $main::locale;
 


@@ -149,8 +139,6 @@ sub save_follow_up {
 sub finish {
   $main::lxdebug->enter_sub();
 
 sub finish {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   my $form     = $main::form;
   my $locale   = $main::locale;
 
   my $form     = $main::form;
   my $locale   = $main::locale;
 


@@ -187,8 +175,6 @@ sub finish {
 sub delete {
   $main::lxdebug->enter_sub();
 
 sub delete {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   my $form     = $main::form;
   my $locale   = $main::locale;
 
   my $form     = $main::form;
   my $locale   = $main::locale;
 


@@ -225,8 +211,6 @@ sub delete {
 sub search {
   $main::lxdebug->enter_sub();
 
 sub search {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   my $form     = $main::form;
   my $locale   = $main::locale;
 
   my $form     = $main::form;
   my $locale   = $main::locale;
 


@@ -244,8 +228,6 @@ sub search {
 sub report {
   $main::lxdebug->enter_sub();
 
 sub report {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;


@@ -358,8 +340,6 @@ sub report {
 sub report_for_todo_list {
   $main::lxdebug->enter_sub();
 
 sub report_for_todo_list {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   my $form     = $main::form;
 
   my @report_params = qw(created_for subject body reference follow_up_date_from follow_up_date_to itime_from itime_to due_only all_users done not_done);
   my $form     = $main::form;
 
   my @report_params = qw(created_for subject body reference follow_up_date_from follow_up_date_to itime_from itime_to due_only all_users done not_done);


@@ -399,8 +379,6 @@ sub report_for_todo_list {
 sub edit_access_rights {
   $main::lxdebug->enter_sub();
 
 sub edit_access_rights {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   my $form     = $main::form;
   my $locale   = $main::locale;
 
   my $form     = $main::form;
   my $locale   = $main::locale;
 


@@ -421,8 +399,6 @@ sub edit_access_rights {
 sub save_access_rights {
   $main::lxdebug->enter_sub();
 
 sub save_access_rights {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   my $form     = $main::form;
   my $locale   = $main::locale;
 
   my $form     = $main::form;
   my $locale   = $main::locale;
 


@@ -451,8 +427,6 @@ sub continue {
 }
 
 sub save {
 }
 
 sub save {

-  $main::auth->assert('productivity');
-

   if ($main::form->{save_nextsub}) {
     call_sub($main::form->{save_nextsub});
   } else {
   if ($main::form->{save_nextsub}) {
     call_sub($main::form->{save_nextsub});
   } else {

diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index 7971c2da890a58b53e6d0b57d1a4fe1aab280218..caf49c44ef8a994bc81b27433d7632b97c8086bb 100644 (file)
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -46,7 +46,7 @@ sub company_logo {
   $main::lxdebug->enter_sub();
 
   my %myconfig = %main::myconfig;
   $main::lxdebug->enter_sub();
 
   my %myconfig = %main::myconfig;

-  $form->{todo_list}  =  create_todo_list('login_screen' => 1) if (!$form->{no_todo_list}) and ($main::auth->check_right($form->{login}, 'productivity'));
+  $form->{todo_list}  =  create_todo_list('login_screen' => 1) if (!$form->{no_todo_list});

 
   $form->{stylesheet} =  $myconfig{stylesheet};
   $form->{title}      =  $::locale->text('kivitendo');
 
   $form->{stylesheet} =  $myconfig{stylesheet};
   $form->{title}      =  $::locale->text('kivitendo');

diff --git a/bin/mozilla/todo.pl b/bin/mozilla/todo.pl
index 9e5ce01979268381335082ad08764fa0d6fd50df..c50d44d5ecc84f678933ecafffba00058225be0a 100644 (file)
--- a/bin/mozilla/todo.pl
+++ b/bin/mozilla/todo.pl
@@ -34,8 +34,6 @@ use strict;
 sub create_todo_list {
   $main::lxdebug->enter_sub();
 
 sub create_todo_list {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   my $form     = $main::form;
 
   my %params   = @_;
   my $form     = $main::form;
 
   my %params   = @_;


@@ -64,8 +62,6 @@ sub create_todo_list {
 sub show_todo_list {
   $main::lxdebug->enter_sub();
 
 sub show_todo_list {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   my $form     = $main::form;
   my $locale   = $main::locale;
 
   my $form     = $main::form;
   my $locale   = $main::locale;
 


@@ -81,8 +77,6 @@ sub show_todo_list {
 sub todo_list_follow_ups {
   $main::lxdebug->enter_sub();
 
 sub todo_list_follow_ups {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   require "bin/mozilla/fu.pl";
 
   my $content = report_for_todo_list();
   require "bin/mozilla/fu.pl";
 
   my $content = report_for_todo_list();


@@ -95,8 +89,6 @@ sub todo_list_follow_ups {
 sub todo_list_overdue_sales_quotations {
   $main::lxdebug->enter_sub();
 
 sub todo_list_overdue_sales_quotations {
   $main::lxdebug->enter_sub();
 

-  $main::auth->assert('productivity');
-

   require "bin/mozilla/oe.pl";
 
   my $content = report_for_todo_list();
   require "bin/mozilla/oe.pl";
 
   my $content = report_for_todo_list();

diff --git a/doc/changelog b/doc/changelog
index 99b035cdde6a2dad93e2a6e4ec0354bc484c623e..653765338f0b10f10b3fd3b59f47b7600f07d703 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -30,14 +30,6 @@ Größere neue Features:
 
 Kleinere neue Features und Detailverbesserungen:
 
 
 Kleinere neue Features und Detailverbesserungen:
 

-- Recht für Produktivität und für Anzeige des Links zum Administrationsmenü
-  Man kann den gesamten Produktivitätsbereich jetzt nur noch nutzen, wenn man die entsprechenden Rechte hat.
-  Auch der Link Unter dem Menü-Punkt Programm zum Administrationsmenü wird jetzt nur noch
-  angezeigt, wenn man entsprechendes Recht hat.
-  Durch ein Upgrade wird allerdings bei schon bestehenden Benutzern automatisch die oben genannten beiden Rechte
-  gesetzt, so dass alle die Produktivität vorher nutzen durften auch weiterhin nutzen dürfen, bzw. so dass
-  bei allen, bei denen der Link auf das Admin-Menü angezeigt wurde, er auch weiterhin angezeigt wird.
-

 - Stückliste für Lieferschein ausdrucken
   Stücklisten-Details (Haken bei Warenliste) für Erzeugnisse wurden seit 2009
   (TEMPLATE_ARRAY Änderung) nicht mehr ausgedruckt,
 - Stückliste für Lieferschein ausdrucken
   Stücklisten-Details (Haken bei Warenliste) für Erzeugnisse wurden seit 2009
   (TEMPLATE_ARRAY Änderung) nicht mehr ausgedruckt,

diff --git a/locale/de/all b/locale/de/all
index d1422f6b893c1d925bb50c6e852a35d7e4a9b8b1..a36239bd3d5a39b9052c61b205a234ee871e8e3a 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1810,7 +1810,6 @@ $self->{texts} = {
   'Show Salesman'               => 'Verkäufer anzeigen',
   'Show TODO list'              => 'Aufgabenliste anzeigen',
   'Show Transfer via default'   => 'Ein- / Auslagern über Standardlagerplatz anzeigen',
   'Show Salesman'               => 'Verkäufer anzeigen',
   'Show TODO list'              => 'Aufgabenliste anzeigen',
   'Show Transfer via default'   => 'Ein- / Auslagern über Standardlagerplatz anzeigen',

-  'Show administration link'    => 'Link zur Administration anzeigen',

   'Show by default'             => 'Standardmäßig anzeigen',
   'Show custom variable search inputs' => 'Suchoptionen für Benutzerdefinierte Variablen verstecken',
   'Show delete button in purchase delivery orders?' => 'Soll der "Löschen"-Knopf bei Einkaufslieferscheinen angezeigt werden?',
   'Show by default'             => 'Standardmäßig anzeigen',
   'Show custom variable search inputs' => 'Suchoptionen für Benutzerdefinierte Variablen verstecken',
   'Show delete button in purchase delivery orders?' => 'Soll der "Löschen"-Knopf bei Einkaufslieferscheinen angezeigt werden?',

diff --git a/menu.ini b/menu.ini
index f066039dceca1b65eef54444695181a6de30750d..a974868bce7c63e8fd723504a609ba12c9968b2b 100644 (file)
--- a/menu.ini
+++ b/menu.ini
@@ -476,7 +476,6 @@ type=receipt
 
 
 [Productivity]
 
 
 [Productivity]

-ACCESS=productivity

 
 [Productivity--Show TODO list]
 module=todo.pl
 
 [Productivity--Show TODO list]
 module=todo.pl


@@ -705,7 +704,6 @@ module=am.pl
 action=config
 
 [Program--Administration area]
 action=config
 
 [Program--Administration area]

-ACCESS=display_admin_link

 module=admin.pl
 action=login
 
 module=admin.pl
 action=login
 

diff --git a/sql/Pg-upgrade2/productivity_rights.pl b/sql/Pg-upgrade2/productivity_rights.pl
deleted file mode 100644 (file)
index 4dd0270..0000000
--- a/sql/Pg-upgrade2/productivity_rights.pl
+++ /dev/null
@@ -1,27 +0,0 @@
-# @tag: productivity_rights
-# @description: Setzt das Recht die Produktivität einzusehen und das Recht den Link zum Admin-Menü anzuzeigen wieder wie vorher
-# @depends: release_3_0_0
-package SL::DBUpgrade2::productivity_rights;
-
-use strict;
-use utf8;
-
-use parent qw(SL::DBUpgrade2::Base);
-
-use SL::DBUtils;
-
-sub run {
-  my ($self) = @_;
-
-  my $groups = $main::auth->read_groups();
-
-  foreach my $group (values %{$groups}) {
-    $group->{rights}->{productivity}       = 1 unless defined $group->{rights}->{productivity};
-    $group->{rights}->{display_admin_link} = 1 unless defined $group->{rights}->{display_admin_link};
-    $main::auth->save_group($group);
-  }
-
-  return 1;
-} # end run
-
-1;