Skip to content

Commit

Permalink
Fix: User rights for viewing PDF. #165
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bartheyrman22
Bartheyrman22 committed Sep 1, 2021
1 parent e888819 commit 88e2b10
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions htdocs/timesheet/core/modules/modtimesheet.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,14 @@ public function __construct($db)
$this->rights[$r][4] = 'timesheet';
$this->rights[$r][5] = 'admin'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
//$this->rights[$r][5] = 'team'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
$r++;
//$r = 0;
$r++; // Add here list of permission defined by an id, a label, a boolean and two constant strings.
$this->rights[$r][0] = 86100203; // Permission id(must not be already used)
$this->rights[$r][1] = 'ExportRead'; // Permission label
$this->rights[$r][3] = 0; // Permission by default for new user(0/1)
$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
//$this->rights[$r][5] = 'admin'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
$r++;
//$r = 0;
$this->rights[$r][0] = 86100211; // Permission id(must not be already used)
$this->rights[$r][1] = 'ApprovalTeam'; // Permission label
$this->rights[$r][3] = 0; // Permission by default for new user(0/1)
Expand All @@ -303,20 +309,20 @@ public function __construct($db)
$this->rights[$r][1] = 'ApprovalOther'; // Permission label
$this->rights[$r][3] = 0; // Permission by default for new user(0/1)
$this->rights[$r][4] = 'approval'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
$this->rights[$r][5] = 'other';
$this->rights[$r][5] = 'other';
$r++; // Add here list of permission defined by an id, a label, a boolean and two constant strings.
// Add here list of permission defined by an id, a label, a boolean and two constant strings.
$this->rights[$r][0] = 86100240; // Permission id(must not be already used)
$this->rights[$r][1] = 'ReportUser'; // Permission label
$this->rights[$r][3] = 0; // Permission by default for new user(0/1)
$this->rights[$r][4] = 'report'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
$this->rights[$r][5] = 'user';
$r++;
$this->rights[$r][5] = 'user';
$r++;
$this->rights[$r][0] = 86100241; // Permission id(must not be already used)
$this->rights[$r][1] = 'ReportProject'; // Permission label
$this->rights[$r][3] = 0; // Permission by default for new user(0/1)
$this->rights[$r][4] = 'report'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
$this->rights[$r][5] = 'project';
$this->rights[$r][5] = 'project';
$r++; // Add here list of permission defined by an id, a label, a boolean and two constant strings.
$this->rights[$r][0] = 86100242; // Permission id(must not be already used)
$this->rights[$r][1] = 'ReportAdmin'; // Permission label
Expand Down Expand Up @@ -493,7 +499,7 @@ public function __construct($db)
'target' => '',
'user' => 2);
$r++;

// impoort
/* $r++;
$this->import_code[$r]=$this->rights_class.'_'.$r;
Expand Down Expand Up @@ -530,7 +536,7 @@ public function init($options = '')
$sql[0].= ' WHERE status IN (1, 5)';//'DRAFT', 'REJECTED'
if ($db->type=='pgsql') {
$sql[1] ="INSERT INTO ".MAIN_DB_PREFIX."document_model(nom, type, entity) VALUES('rat', 'timesheetReport', ".$conf->entity.") ON CONFLICT(nom, type, entity) DO NOTHING;";
$sql[2] ="INSERT INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active ) values (8210160, 'project', 'internal', 'PROJECTBILLING', 'Responsable Facturation Projet', 1) ON CONFLICT(element, source, code) DO NOTHING;";
$sql[2] ="INSERT INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active ) values (8210160, 'project', 'internal', 'PROJECTBILLING', 'Responsable Facturation Projet', 1) ON CONFLICT(element, source, code) DO NOTHING;";
}else {
$sql[1] ="INSERT IGNORE INTO ".MAIN_DB_PREFIX."document_model(nom, type, entity) VALUES('rat', 'timesheetReport', ".$conf->entity.");";
$sql[2] ="INSERT IGNORE INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active ) values (8210160, 'project', 'internal', 'PROJECTBILLING', 'Responsable Facturation Projet', 1);";
Expand Down

0 comments on commit 88e2b10

Please sign in to comment.