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

Merged in bugfix/HOR-3841 (pull request #6126)

Browse Source 
HOR-3841

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Roly
2017-10-19 22:03:27 +00:00
committed by Paula Quispe
parent 37b2a39c9f 4ec3e2a90a
commit 2032b5076a
4 changed files with 23 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -1747,6 +1747,12 @@ msgstr "Databases Source List"
msgid "Changes saved"
msgstr "Changes saved"
# TRANSLATION
# LABEL/ID_SELECT_USER_OR_GROUP
#: LABEL/ID_SELECT_USER_OR_GROUP
msgid "Please select the name of a user or a group in the Group or User field"
msgstr "Please select the name of a user or a group in the Group or User field"
# TRANSLATION
# LABEL/ID_EMAILS
#: LABEL/ID_EMAILS

3
workflow/engine/data/mysql/insert.sql
View File

@@ -6189,7 +6189,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CASE_ROUTED_TO','en','Case routed to','2017-06-02'),
( 'LABEL','ID_IMPORTED','en','IMPORTED','2017-10-03'),
( 'LABEL','ID_NOT_IMPORTED','en','NOT IMPORTED','2017-10-03'),
( 'LABEL','ID_CANNOT_IMPORT','en','CANNOT IMPORT','2017-10-03');
( 'LABEL','ID_CANNOT_IMPORT','en','CANNOT IMPORT','2017-10-03'),
( 'LABEL','ID_SELECT_USER_OR_GROUP','en','Please select the name of a user or a group in the Group or User field','2017-10-19');
INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('AD','','',' ','') ,

4
workflow/engine/src/ProcessMaker/BusinessModel/ProcessPermissions.php
View File

@@ -5,6 +5,7 @@ use Behat\Behat\Exception\Exception;
use \G;
use \Criteria;
use \ObjectPermissionPeer;
use \Exception as StandardException;
/**
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
@@ -224,6 +225,9 @@ class ProcessPermissions
if ($opUid != '') {
$opUid = $this->validateOpUid($opUid);
}
if (empty($data['USR_UID']) || (isset($data['USR_UID']) && $data['USR_UID'] === "null")) {
throw (new StandardException(G::LoadTranslation("ID_SELECT_USER_OR_GROUP")));
}
if ($data['OP_USER_RELATION'] == "1") {
$this->validateUsrUid($data['USR_UID']);
} else {

44
workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessPermissions.php
View File

@@ -58,44 +58,22 @@ class ProcessPermissions extends Api
}
/**
* Creates a new Process Permission for a project.
*
* @url POST /:prj_uid/process-permission/
* @status 201
*
* @param string $prj_uid {@min 1} {@max 32}
* @param array $request_data
*
* @param string $usr_uid {@from body} {@min 1} {@max 32}
* @param string $op_user_relation {@from body} {@choice 1,2}
* @param string $op_case_status {@from body} {@choice ALL,DRAFT,TO_DO,PAUSED,COMPLETED}
* @param string $op_participate {@from body} {@choice 0,1}
* @param string $op_obj_type {@from body} {@choice ANY,DYNAFORM,ATTACHMENT,INPUT,OUTPUT,CASES_NOTES,MSGS_HISTORY,SUMMARY_FORM}
* @param string $op_action {@from body} {@choice VIEW,BLOCK,DELETE,RESEND}
* @param string $tas_uid {@from body}
* @param string $op_task_source {@from body}
* @param string $dynaforms {@from body}
* @param string $inputs {@from body}
* @param string $outputs {@from body}
*
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
* @copyright Colosa - Bolivia
*
* @return array
*
* @url POST /:prj_uid/process-permission/
* @status 201
* @throws RestException
*
* @access protected
* @class AccessControl {@permission PM_FACTORY}
*/
public function doPostProcessPermission(
$prj_uid,
$request_data,
$usr_uid,
$op_user_relation,
$op_case_status,
$op_participate,
$op_obj_type,
$op_action,
$tas_uid = '',
$op_task_source = '',
$dynaforms = '',
$inputs = '',
$outputs = ''
) {
public function doPostProcessPermission($prj_uid, $request_data)
{
try {
$hiddenFields = array('task_target', 'group_user', 'task_source',
'object_type', 'object', 'participated', 'action'