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

Merged in victorsl/processmaker (pull request #550)

Browse Source 
ProcessMaker-BE "Group (fixes)"
This commit is contained in:
Erik Amaru Ortiz
2014-06-25 09:26:26 -04:00
parent c732b7b4a8 04564c11c3
commit e9914d7971
6 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
workflow/engine/src/ProcessMaker/BusinessModel/Group.php
View File

@@ -266,6 +266,12 @@ class Group
//Verify data
$this->throwExceptionIfNotExistsGroup($groupUid, $this->arrayFieldNameForException["groupUid"]);
$arrayTotalTasksByGroup = $this->getTotalTasksByGroup($groupUid);
if (isset($arrayTotalTasksByGroup[$groupUid]) && $arrayTotalTasksByGroup[$groupUid] > 0) {
throw new \Exception(\G::LoadTranslation("ID_GROUP_CANNOT_DELETE_WHILE_ASSIGNED_TO_TASK"));
}
//Delete
$group = new \Groupwf();
@@ -343,7 +349,7 @@ class Group
$criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\GroupUserPeer::GRP_UID);
$criteria->addSelectColumn("COUNT(" . \GroupUserPeer::GRP_UID . ") AS NUM_REC");
$criteria->addAsColumn("NUM_REC", "COUNT(" . \GroupUserPeer::GRP_UID . ")");
$criteria->addJoin(\GroupUserPeer::USR_UID, \UsersPeer::USR_UID, \Criteria::INNER_JOIN);
if ($groupUid != "") {
@@ -359,7 +365,7 @@ class Group
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$arrayData[$row["GRP_UID"]] = $row["NUM_REC"];
$arrayData[$row["GRP_UID"]] = (int)($row["NUM_REC"]);
}
//Return
@@ -390,7 +396,7 @@ class Group
$criteria = new \Criteria("workflow");
$criteria->addAsColumn("GRP_UID", \TaskUserPeer::USR_UID);
$criteria->addSelectColumn("COUNT(" . \TaskUserPeer::USR_UID . ") AS NUM_REC");
$criteria->addAsColumn("NUM_REC", "COUNT(" . \TaskUserPeer::USR_UID . ")");
if ($groupUid != "") {
$criteria->add(\TaskUserPeer::USR_UID, $groupUid, \Criteria::EQUAL);
@@ -406,7 +412,7 @@ class Group
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$arrayData[$row["GRP_UID"]] = $row["NUM_REC"];
$arrayData[$row["GRP_UID"]] = (int)($row["NUM_REC"]);
}
//Return
@@ -430,8 +436,8 @@ class Group
$this->getFieldNameByFormatFieldName("GRP_UID") => $record["GRP_UID"],
$this->getFieldNameByFormatFieldName("GRP_TITLE") => $record["GRP_TITLE"],
$this->getFieldNameByFormatFieldName("GRP_STATUS") => $record["GRP_STATUS"],
$this->getFieldNameByFormatFieldName("GRP_USERS") => (int)($record["GRP_USERS"]),
$this->getFieldNameByFormatFieldName("GRP_TASKS") => (int)($record["GRP_TASKS"])
$this->getFieldNameByFormatFieldName("GRP_USERS") => $record["GRP_USERS"],
$this->getFieldNameByFormatFieldName("GRP_TASKS") => $record["GRP_TASKS"]
);
} catch (\Exception $e) {
throw $e;
@@ -478,7 +484,7 @@ class Group
$criteriaCount = clone $criteria;
$criteriaCount->clearSelectColumns();
$criteriaCount->addSelectColumn("COUNT(" . \GroupwfPeer::GRP_UID . ") AS NUM_REC");
$criteriaCount->addAsColumn("NUM_REC", "COUNT(" . \GroupwfPeer::GRP_UID . ")");
$rsCriteriaCount = \GroupwfPeer::doSelectRS($criteriaCount);
$rsCriteriaCount->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
@@ -486,22 +492,16 @@ class Group
$rsCriteriaCount->next();
$row = $rsCriteriaCount->getRow();
$numRecTotal = $row["NUM_REC"];
$numRecTotal = (int)($row["NUM_REC"]);
//SQL
if (!is_null($sortField) && trim($sortField) != "") {
$sortField = strtoupper($sortField);
switch ($sortField) {
case "GRP_UID":
case "GRP_STATUS":
case "GRP_LDAP_DN":
case "GRP_UX":
$sortField = \GroupwfPeer::TABLE_NAME . "." . $sortField;
break;
default:
$sortField = "GRP_TITLE";
break;
if (in_array($sortField, array("GRP_UID", "GRP_STATUS", "GRP_LDAP_DN", "GRP_UX"))) {
$sortField = \GroupwfPeer::TABLE_NAME . "." . $sortField;
} else {
$sortField = "GRP_TITLE";
}
} else {
$sortField = "GRP_TITLE";
@@ -708,7 +708,7 @@ class Group
$criteriaCount = clone $criteria;
$criteriaCount->clearSelectColumns();
$criteriaCount->addSelectColumn("COUNT(" . \UsersPeer::USR_UID . ") AS NUM_REC");
$criteriaCount->addAsColumn("NUM_REC", "COUNT(" . \UsersPeer::USR_UID . ")");
$rsCriteriaCount = \UsersPeer::doSelectRS($criteriaCount);
$rsCriteriaCount->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
@@ -716,24 +716,16 @@ class Group
$rsCriteriaCount->next();
$row = $rsCriteriaCount->getRow();
$numRecTotal = $row["NUM_REC"];
$numRecTotal = (int)($row["NUM_REC"]);
//SQL
if (!is_null($sortField) && trim($sortField) != "") {
$sortField = strtoupper($sortField);
switch ($sortField) {
case "USR_UID":
case "USR_USERNAME":
case "USR_FIRSTNAME":
case "USR_LASTNAME":
case "USR_EMAIL":
case "USR_STATUS":
$sortField = \UsersPeer::TABLE_NAME . "." . $sortField;
break;
default:
$sortField = \UsersPeer::USR_USERNAME;
break;
if (in_array($sortField, array("USR_UID", "USR_USERNAME", "USR_FIRSTNAME", "USR_LASTNAME", "USR_EMAIL", "USR_STATUS"))) {
$sortField = \UsersPeer::TABLE_NAME . "." . $sortField;
} else {
$sortField = \UsersPeer::USR_USERNAME;
}
} else {
$sortField = \UsersPeer::USR_USERNAME;

10
workflow/engine/src/ProcessMaker/BusinessModel/ProcessCategory.php
View File

@@ -302,7 +302,7 @@ class ProcessCategory
$arrayTotalProcessesByCategory = $process->getAllProcessesByCategory();
if (isset($arrayTotalProcessesByCategory[$categoryUid])) {
if (isset($arrayTotalProcessesByCategory[$categoryUid]) && (int)($arrayTotalProcessesByCategory[$categoryUid])> 0) {
throw new \Exception(\G::LoadTranslation("ID_MSG_CANNOT_DELETE_CATEGORY"));
}
@@ -351,7 +351,7 @@ class ProcessCategory
return array(
$this->getFieldNameByFormatFieldName("CAT_UID") => $record["CATEGORY_UID"],
$this->getFieldNameByFormatFieldName("CAT_NAME") => $record["CATEGORY_NAME"],
$this->getFieldNameByFormatFieldName("CAT_TOTAL_PROCESSES") => (int)($record["CATEGORY_TOTAL_PROCESSES"])
$this->getFieldNameByFormatFieldName("CAT_TOTAL_PROCESSES") => $record["CATEGORY_TOTAL_PROCESSES"]
);
} catch (\Exception $e) {
throw $e;
@@ -408,7 +408,7 @@ class ProcessCategory
$rsCriteriaCount->next();
$row = $rsCriteriaCount->getRow();
$numRecTotal = $row["NUM_REC"];
$numRecTotal = (int)($row["NUM_REC"]);
//SQL
if (!is_null($sortField) && trim($sortField) != "") {
@@ -444,7 +444,7 @@ class ProcessCategory
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$row["CATEGORY_TOTAL_PROCESSES"] = (isset($arrayTotalProcessesByCategory[$row["CATEGORY_UID"]]))? $arrayTotalProcessesByCategory[$row["CATEGORY_UID"]] : 0;
$row["CATEGORY_TOTAL_PROCESSES"] = (isset($arrayTotalProcessesByCategory[$row["CATEGORY_UID"]]))? (int)($arrayTotalProcessesByCategory[$row["CATEGORY_UID"]]) : 0;
$arrayCategory[] = $this->getCategoryDataFromRecord($row);
}
@@ -491,7 +491,7 @@ class ProcessCategory
$row = $rsCriteria->getRow();
if (!$flagGetRecord) {
$row["CATEGORY_TOTAL_PROCESSES"] = (isset($arrayTotalProcessesByCategory[$row["CATEGORY_UID"]]))? $arrayTotalProcessesByCategory[$row["CATEGORY_UID"]] : 0;
$row["CATEGORY_TOTAL_PROCESSES"] = (isset($arrayTotalProcessesByCategory[$row["CATEGORY_UID"]]))? (int)($arrayTotalProcessesByCategory[$row["CATEGORY_UID"]]) : 0;
}
//Return

2
workflow/engine/src/ProcessMaker/BusinessModel/Role.php
View File

@@ -530,7 +530,7 @@ class Role
$rsCriteriaCount->next();
$row = $rsCriteriaCount->getRow();
$numRecTotal = $row["NUM_REC"];
$numRecTotal = (int)($row["NUM_REC"]);
//SQL
if (!is_null($sortField) && trim($sortField) != "") {

2
workflow/engine/src/ProcessMaker/Project/Bpmn.php
View File

@@ -105,8 +105,6 @@ class Bpmn extends Handler
// setting defaults
$data['PRJ_UID'] = array_key_exists('PRJ_UID', $data) ? $data['PRJ_UID'] : Common::generateUID();
unset($data["PRJ_UPDATE_DATE"]);
self::log("Create Project with data: ", $data);
$this->project = new Project();
$this->project->fromArray($data, BasePeer::TYPE_FIELDNAME);

6
workflow/engine/src/ProcessMaker/Project/Workflow.php
View File

@@ -44,7 +44,11 @@ class Workflow extends Handler
$process = new Process();
$processData = $process->load($proUid);
} catch (\Exception $e) {
throw $e;
if (is_null(\ProcessPeer::retrieveByPK($proUid))) {
throw new Exception\ProjectNotFound($me, $proUid);
} else {
throw $e;
}
}
$me->process = $processData;