fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master' into PM-2762

Browse Source
This commit is contained in:
dheeyi
2015-05-22 12:05:57 -04:00
parent f63be71275 31cf89ca70
commit 468e04396a
8 changed files with 64 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -77,6 +77,12 @@ class BpmnWorkflow extends Project\Bpmn
$this->wp = new Project\Workflow();
$this->wp->create($wpData);
//Add Audit Log
$ogetProcess = new \Process();
$getprocess=$ogetProcess->load($this->getUid());
$nameProcess=$getprocess['PRO_TITLE'];
\G::auditLog("ImportProcess", 'PMX File Imported '.$nameProcess. ' ('.$this->getUid().')');
} catch (\Exception $e) {
$prjUid = $this->getUid();
//$this->remove();

7
workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php
View File

@@ -64,6 +64,13 @@ class WorkflowBpmn extends Project\Workflow
// At this time we will add a default diagram and process
$this->bp->addDiagram();
$this->bp->addProcess();
//Add Audit Log
$ogetProcess = new \Process();
$getprocess=$ogetProcess->load($this->getUid());
$nameProcess=$getprocess['PRO_TITLE'];
\G::auditLog("ImportProcess", 'BPMN Imported '.$nameProcess. ' ('.$this->getUid().')');
} catch (\Exception $e) {
$prjUid = $this->getUid();
$this->remove();

10
workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
View File

@@ -190,8 +190,14 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
/* OAuth2_Storage_UserCredentialsInterface */
public function checkUserCredentials($username, $password)
{
if ($user = $this->getUser($username)) {
return $this->checkPassword($user, $password);
$RBAC = \RBAC::getSingleton();
$RBAC->initRBAC();
$uid = $RBAC->VerifyLogin($username , $password);
if($uid < 0){
return false;
}
if($uid != ''){
return true;
}
return false;
}