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

Dolibarrize module

Browse Source
This commit is contained in:
Laurent Destailleur 2018-03-11 18:28:27 +01:00
parent f0a0c8c3e5
commit 8b6dea218b
5 changed files with 75 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
htdocs/core/modules/modTicketsup.class.php
View File

@ -1,6 +1,5 @@
<?php <?php
/* Module descriptor for ticket system /* Copyright (C) - 2013-2018 Jean-François FERRY <hello@librethic.io>
* Copyright (C) - 2013-2018 Jean-François FERRY <hello@librethic.io>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -14,17 +13,20 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Module descriptor for ticket system
*/ */
/** /**
* \defgroup ticketsup Ticketsup module * \defgroup ticketsup Ticketsup module
* \brief Ticketsup module descriptor. * \brief Ticketsup module descriptor.
* \file core/modules/modTicketsup.class.php * \file core/modules/modTicketsup.class.php
* \ingroup ticketsup * \ingroup ticketsup
* \brief Description and activation file for module Ticketsup * \brief Description and activation file for module Ticketsup
*/ */
require_once DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php"; require_once DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php";
/** /**
* Description and activation class for module Ticketsup * Description and activation class for module Ticketsup
*/ */
@ -45,13 +47,10 @@ class modTicketsup extends DolibarrModules
// Id for module (must be unique). // Id for module (must be unique).
// Use a free id here // Use a free id here
// (See in Home -> System information -> Dolibarr for list of used modules id). // (See in Home -> System information -> Dolibarr for list of used modules id).
$this->numero = 110120; $this->numero = 56000;
// Key text used to identify module (for permissions, menus, etc...) // Key text used to identify module (for permissions, menus, etc...)
$this->rights_class = 'ticketsup'; $this->rights_class = 'ticketsup';
$this->editor_name = "Dolibarr";
$this->editor_web = "https://dolibrr.org";
// Family can be 'crm','financial','hr','projects','products','ecm','technic','other' // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
// It is used to group modules in module setup page // It is used to group modules in module setup page
$this->family = "crm"; $this->family = "crm";
@ -70,9 +69,6 @@ class modTicketsup extends DolibarrModules
// Key used in llx_const table to save module status enabled/disabled // Key used in llx_const table to save module status enabled/disabled
// (where MYMODULE is value of property name of module in uppercase) // (where MYMODULE is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name); $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
// Where to store the module in setup page
// (0=common,1=interface,2=others,3=very specific)
$this->special = 2;
// Name of image file used for this module. // Name of image file used for this module.
// If file is in theme/yourtheme/img directory under name object_pictovalue.png // If file is in theme/yourtheme/img directory under name object_pictovalue.png
// use this->picto='pictovalue' // use this->picto='pictovalue'
@ -168,43 +164,36 @@ class modTicketsup extends DolibarrModules
$r = 0; $r = 0;
$r++; $r++;
$this->rights[$r][0] = 110120; // id de la permission $this->rights[$r][0] = 56001; // id de la permission
$this->rights[$r][1] = "Créer un ticket"; // libelle de la permission $this->rights[$r][1] = "Read ticket"; // libelle de la permission
$this->rights[$r][2] = 'c'; // type de la permission (deprecie a ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'create';
$r++;
$this->rights[$r][0] = 110121; // id de la permission
$this->rights[$r][1] = "Lire les tickets"; // libelle de la permission
$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour) $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
$this->rights[$r][3] = 1; // La permission est-elle une permission par defaut $this->rights[$r][3] = 1; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'read'; $this->rights[$r][4] = 'read';
$r++; $r++;
$this->rights[$r][0] = 110122; // id de la permission $this->rights[$r][0] = 56002; // id de la permission
$this->rights[$r][1] = "Modifier les tickets"; // libelle de la permission $this->rights[$r][1] = "Create les tickets"; // libelle de la permission
$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour) $this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'write'; $this->rights[$r][4] = 'write';
$r++; $r++;
$this->rights[$r][0] = 110123; // id de la permission $this->rights[$r][0] = 56003; // id de la permission
$this->rights[$r][1] = "Supprimer les tickets"; // libelle de la permission $this->rights[$r][1] = "Delete les tickets"; // libelle de la permission
$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour) $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'delete'; $this->rights[$r][4] = 'delete';
$r++; $r++;
$this->rights[$r][0] = 110124; // id de la permission $this->rights[$r][0] = 56004; // id de la permission
$this->rights[$r][1] = "Gérer les tickets"; // libelle de la permission $this->rights[$r][1] = "Manage tickets"; // libelle de la permission
//$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour) //$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'manage'; $this->rights[$r][4] = 'manage';
$r++; $r++;
$this->rights[$r][0] = 110125; // id de la permission $this->rights[$r][0] = 56005; // id de la permission
$this->rights[$r][1] = 'Voir tous les tickets (non effectif pour les utilisateurs externes, toujours limités au tiers dont ils dépendent)'; // libelle de la permission $this->rights[$r][1] = 'See all tickets, even if not assigned to (not effective for external users, always restricted to the thirdpardy they depends on)'; // libelle de la permission
$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour) $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'view'; $this->rights[$r][4] = 'view';
@ -250,7 +239,7 @@ class modTicketsup extends DolibarrModules
'langs' => 'ticketsup@ticketsup', 'langs' => 'ticketsup@ticketsup',
'position' => 102, 'position' => 102,
'enabled' => 1, 'enabled' => 1,
'perms' => '$user->rights->ticketsup->create', 'perms' => '$user->rights->ticketsup->write',
'target' => '', 'target' => '',
'user' => 2); 'user' => 2);
$r++; $r++;

2
htdocs/ticketsup/class/actions_ticketsup.class.php
View File

@ -134,7 +134,7 @@ class ActionsTicketsup
////} ////}
} }
if (GETPOST('add_ticket') && $user->rights->ticketsup->create) { if (GETPOST('add_ticket') && $user->rights->ticketsup->write) {
$error = 0; $error = 0;
if (!GETPOST("subject")) { if (!GETPOST("subject")) {

8
htdocs/ticketsup/class/api_ticketsups.class.php
View File

@ -303,7 +303,7 @@ class Ticketsups extends DolibarrApi
public function post($request_data = null) public function post($request_data = null)
{ {
$ticketstatic = new Ticketsup($this->db); $ticketstatic = new Ticketsup($this->db);
if (! DolibarrApiAccess::$user->rights->ticketsup->create) { if (! DolibarrApiAccess::$user->rights->ticketsup->write) {
throw new RestException(401); throw new RestException(401);
} }
// Check mandatory fields // Check mandatory fields
@ -334,7 +334,7 @@ class Ticketsups extends DolibarrApi
public function postNewMessage($request_data = null) public function postNewMessage($request_data = null)
{ {
$ticketstatic = new Ticketsup($this->db); $ticketstatic = new Ticketsup($this->db);
if (! DolibarrApiAccess::$user->rights->ticketsup->create) { if (! DolibarrApiAccess::$user->rights->ticketsup->write) {
throw new RestException(401); throw new RestException(401);
} }
// Check mandatory fields // Check mandatory fields
@ -365,7 +365,7 @@ class Ticketsups extends DolibarrApi
*/ */
public function put($id, $request_data = null) public function put($id, $request_data = null)
{ {
if (! DolibarrApiAccess::$user->rights->ticketsup->create) { if (! DolibarrApiAccess::$user->rights->ticketsup->write) {
throw new RestException(401); throw new RestException(401);
} }
@ -398,7 +398,7 @@ class Ticketsups extends DolibarrApi
*/ */
public function delete($id) public function delete($id)
{ {
if (! DolibarrApiAccess::$user->rights->ticketsup->supprimer) { if (! DolibarrApiAccess::$user->rights->ticketsup->delete) {
throw new RestException(401); throw new RestException(401);
} }
$result = $this->ticketsup->fetch($id); $result = $this->ticketsup->fetch($id);

2
htdocs/ticketsup/list.php
View File

@ -701,7 +701,7 @@ if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nb
$filedir=$diroutputmassaction; $filedir=$diroutputmassaction;
$genallowed=$user->rights->ticketsup->read; $genallowed=$user->rights->ticketsup->read;
$delallowed=$user->rights->ticketsup->create; $delallowed=$user->rights->ticketsup->write;
print $formfile->showdocuments('massfilesarea_ticketsup','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty); print $formfile->showdocuments('massfilesarea_ticketsup','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
} }

2
htdocs/ticketsup/new.php
View File

@ -44,7 +44,7 @@ $notnotifytiersatcreate = !empty($notNotifyTiers);
$action = GETPOST('action', 'alpha', 3); $action = GETPOST('action', 'alpha', 3);
// Protection if external user // Protection if external user
if (!$user->rights->ticketsup->read || !$user->rights->ticketsup->create) { if (!$user->rights->ticketsup->read || !$user->rights->ticketsup->write) {
accessforbidden(); accessforbidden();
} }