fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in gproly/processmaker/HOR-1488 (pull request #4629)

Browse Source 
HOR-1488
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-28 18:27:09 -04:00
parent 6ef6573ba0 03c6c7a92b
commit f56f75c0e0
2 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
workflow/engine/src/ProcessMaker/Services/Api/Calendar.php
View File

@@ -14,26 +14,9 @@ class Calendar extends Api
private $formatFieldNameInUppercase = false;
/**
* Constructor of the class
*
* return void
*/
public function __construct()
{
try {
$user = new \ProcessMaker\BusinessModel\User();
$usrUid = $this->getUserId();
if (!$user->checkPermission($usrUid, "PM_SETUP")) {
throw new \Exception(\G::LoadTranslation("ID_USER_NOT_HAVE_PERMISSION", array($usrUid)));
}
} catch (\Exception $e) {
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
}
/**
*
* @access protected
* @class AccessControl {@permission PM_SETUP_CALENDAR}
* @url GET
*/
public function index($filter = null, $start = null, $limit = null)
@@ -50,6 +33,9 @@ class Calendar extends Api
}
/**
*
* @access protected
* @class AccessControl {@permission PM_SETUP_CALENDAR}
* @url GET /:cal_uid
*
* @param string $cal_uid {@min 32}{@max 32}
@@ -68,6 +54,9 @@ class Calendar extends Api
}
/**
*
* @access protected
* @class AccessControl {@permission PM_SETUP_CALENDAR}
* @url POST
*
* @param array $request_data
@@ -91,6 +80,9 @@ class Calendar extends Api
}
/**
*
* @access protected
* @class AccessControl {@permission PM_SETUP_CALENDAR}
* @url PUT /:cal_uid
*
* @param string $cal_uid {@min 32}{@max 32}
@@ -109,6 +101,9 @@ class Calendar extends Api
}
/**
*
* @access protected
* @class AccessControl {@permission PM_SETUP_CALENDAR}
* @url DELETE /:cal_uid
*
* @param string $cal_uid {@min 32}{@max 32}

22
workflow/engine/src/ProcessMaker/Services/Api/ProcessCategory.php
View File

@@ -21,13 +21,6 @@ class ProcessCategory extends Api
public function __construct()
{
try {
$user = new \ProcessMaker\BusinessModel\User();
$usrUid = $this->getUserId();
if (!$user->checkPermission($usrUid, "PM_SETUP")) {
throw new \Exception(\G::LoadTranslation("ID_USER_NOT_HAVE_PERMISSION", array($usrUid)));
}
$this->category = new \ProcessMaker\BusinessModel\ProcessCategory();
@@ -38,6 +31,9 @@ class ProcessCategory extends Api
}
/**
*
* @access protected
* @class AccessControl {@permission PM_SETUP_PROCESS_CATEGORIES}
* @url GET /categories
*/
public function doGetCategories($filter = null, $start = null, $limit = null)
@@ -52,6 +48,9 @@ class ProcessCategory extends Api
}
/**
*
* @access protected
* @class AccessControl {@permission PM_SETUP_PROCESS_CATEGORIES}
* @url GET /category/:cat_uid
*
* @param string $cat_uid {@min 32}{@max 32}
@@ -68,6 +67,9 @@ class ProcessCategory extends Api
}
/**
*
* @access protected
* @class AccessControl {@permission PM_SETUP_PROCESS_CATEGORIES}
* @url POST /category
*
* @param array $request_data
@@ -88,6 +90,9 @@ class ProcessCategory extends Api
}
/**
*
* @access protected
* @class AccessControl {@permission PM_SETUP_PROCESS_CATEGORIES}
* @url PUT /category/:cat_uid
*
* @param string $cat_uid {@min 32}{@max 32}
@@ -103,6 +108,9 @@ class ProcessCategory extends Api
}
/**
*
* @access protected
* @class AccessControl {@permission PM_SETUP_PROCESS_CATEGORIES}
* @url DELETE /category/:cat_uid
*
* @param string $cat_uid {@min 32}{@max 32}