lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Try to restore a broken feature.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-11-13 04:10:59 +00:00
parent 7752d8a354
commit 339bdde1e0
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/comm/action/fiche.php
View File

@ -294,8 +294,8 @@ if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes')
$actioncomm = new ActionComm($db); $actioncomm = new ActionComm($db);
$actioncomm->fetch($_GET["id"]); $actioncomm->fetch($_GET["id"]);
if ($user->rights->agenda->myactions->create if ($user->rights->agenda->myactions->delete
|| $user->rights->agenda->allactions->create) || $user->rights->agenda->allactions->delete)
{ {
$result=$actioncomm->delete(); $result=$actioncomm->delete();
@ -895,8 +895,8 @@ if ($_GET["id"])
print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Modify").'</a>'; print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Modify").'</a>';
} }
if ($user->rights->agenda->allactions->create || if ($user->rights->agenda->allactions->delete ||
(($act->author->id == $user->id || $act->usertodo->id == $user->id) && $user->rights->agenda->myactions->create)) (($act->author->id == $user->id || $act->usertodo->id == $user->id) && $user->rights->agenda->myactions->delete))
{ {
print '<a class="butActionDelete" href="fiche.php?action=delete&id='.$act->id.'">'.$langs->trans("Delete").'</a>'; print '<a class="butActionDelete" href="fiche.php?action=delete&id='.$act->id.'">'.$langs->trans("Delete").'</a>';
} }

12
htdocs/includes/modules/modAgenda.class.php
View File

@ -109,7 +109,7 @@ class modAgenda extends DolibarrModules
$r++; $r++;
$this->rights[$r][0] = 2402; $this->rights[$r][0] = 2402;
$this->rights[$r][1] = 'Create/delete actions/tasks linked to his account'; $this->rights[$r][1] = 'Create/modify actions/tasks linked to his account';
$this->rights[$r][2] = 'w'; $this->rights[$r][2] = 'w';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'myactions'; $this->rights[$r][4] = 'myactions';
@ -117,11 +117,11 @@ class modAgenda extends DolibarrModules
$r++; $r++;
$this->rights[$r][0] = 2403; $this->rights[$r][0] = 2403;
$this->rights[$r][1] = 'Modify actions/tasks linked to his account'; $this->rights[$r][1] = 'Delete actions/tasks linked to his account';
$this->rights[$r][2] = 'w'; $this->rights[$r][2] = 'w';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'myactions'; $this->rights[$r][4] = 'myactions';
$this->rights[$r][5] = 'modify'; $this->rights[$r][5] = 'delete';
$r++; $r++;
$this->rights[$r][0] = 2411; $this->rights[$r][0] = 2411;
@ -133,7 +133,7 @@ class modAgenda extends DolibarrModules
$r++; $r++;
$this->rights[$r][0] = 2412; $this->rights[$r][0] = 2412;
$this->rights[$r][1] = 'Create/delete actions/tasks of others'; $this->rights[$r][1] = 'Create/modify actions/tasks of others';
$this->rights[$r][2] = 'w'; $this->rights[$r][2] = 'w';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'allactions'; $this->rights[$r][4] = 'allactions';
@ -141,11 +141,11 @@ class modAgenda extends DolibarrModules
$r++; $r++;
$this->rights[$r][0] = 2413; $this->rights[$r][0] = 2413;
$this->rights[$r][1] = 'Modify actions/tasks of others'; $this->rights[$r][1] = 'Delete actions/tasks of others';
$this->rights[$r][2] = 'w'; $this->rights[$r][2] = 'w';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'allactions'; $this->rights[$r][4] = 'allactions';
$this->rights[$r][5] = 'modify'; $this->rights[$r][5] = 'delete';
$r++; $r++;
// Main menu entries // Main menu entries

8
htdocs/langs/en_US/admin.lang
View File

@ -548,11 +548,11 @@ Permission1251=Run mass imports of external data into database (data load)
Permission1321=Export customer invoices, attributes and payments Permission1321=Export customer invoices, attributes and payments
Permission1421=Export customer orders and attributes Permission1421=Export customer orders and attributes
Permission2401=Read actions (events or tasks) linked to his account Permission2401=Read actions (events or tasks) linked to his account
Permission2402=Create/delete actions (events or tasks) linked to his account Permission2402=Create/modify actions (events or tasks) linked to his account
Permission2403=Modify actions (events or tasks) linked to his account Permission2403=Delete actions (events or tasks) linked to his account
Permission2411=Read actions (events or tasks) of others Permission2411=Read actions (events or tasks) of others
Permission2412=Create/delete actions (events or tasks) of others Permission2412=Create/modify actions (events or tasks) of others
Permission2413=Modify actions (events or tasks) of others Permission2413=Delete actions (events or tasks) of others
Permission2500=Read documents Permission2500=Read documents
Permission2501=Submit or delete documents Permission2501=Submit or delete documents
Permission2515=Setup documents directories Permission2515=Setup documents directories

8
htdocs/langs/fr_FR/admin.lang
View File

@ -548,11 +548,11 @@ Permission1251 = Lancer des imports de masse dans la base (chargement de donnée
Permission1321 = Exporter les factures clients, attributs et règlements Permission1321 = Exporter les factures clients, attributs et règlements
Permission1421 = Exporter les commandes clients et attributs Permission1421 = Exporter les commandes clients et attributs
Permission2401 = Lire les actions (évènements ou tâches) liées à son compte Permission2401 = Lire les actions (évènements ou tâches) liées à son compte
Permission2402 = Creer/supprimer les actions (évènements ou tâches) liées à son compte Permission2402 = Creer/modifier les actions (évènements ou tâches) liées à son compte
Permission2403 = Modifier les actions (évènements ou tâches) liées à son compte Permission2403 = Supprimer les actions (évènements ou tâches) liées à son compte
Permission2411 = Lire les actions (évènements ou tâches) des autres Permission2411 = Lire les actions (évènements ou tâches) des autres
Permission2412 = Creer/supprimer les actions (évènements ou tâches) pour les autres Permission2412 = Creer/modifier les actions (évènements ou tâches) pour les autres
Permission2413 = Modifier les actions (évènements ou tâches) pour les autres Permission2413 = Supprimer les actions (évènements ou tâches) pour les autres
Permission2500 = Consulter les documents Permission2500 = Consulter les documents
Permission2501 = Soumettre ou supprimer des documents Permission2501 = Soumettre ou supprimer des documents
Permission2515 = Administrer les rubriques de documents Permission2515 = Administrer les rubriques de documents