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

HOR-1312 Agregar el campo GRP_TITLE en la tabla GROUPWF

Browse Source 
add method remove in table content
This commit is contained in:
qronald
2016-06-16 16:23:42 -04:00
parent a41785f378
commit b133bd50b2
13 changed files with 150 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
workflow/engine/classes/class.processes.php
View File

@@ -4326,10 +4326,7 @@ class Processes
$criteria = new Criteria("workflow");
$criteria->addSelectColumn(GroupwfPeer::GRP_UID);
$criteria->addSelectColumn(ContentPeer::CON_VALUE);
$criteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
$criteria->add(ContentPeer::CON_CATEGORY, "GRP_TITLE", Criteria::EQUAL);
$criteria->add(ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL);
$criteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$rsCriteria = GroupwfPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -4349,7 +4346,7 @@ class Processes
foreach ($arrayGroupwf as $key2 => $value2) {
$groupwfRecord = $value2;
if ($groupwfRecord["CON_VALUE"] == $groupwfsRecord["GRP_TITLE"] && $groupwfRecord["GRP_UID"] != $groupwfsRecord["GRP_UID"]) {
if ($groupwfRecord["GRP_TITLE"] == $groupwfsRecord["GRP_TITLE"] && $groupwfRecord["GRP_UID"] != $groupwfsRecord["GRP_UID"]) {
//Update unique id
$uidOld = $data->groupwfs[$key]["GRP_UID"];
@@ -4763,12 +4760,8 @@ class Processes
$aGroupwf = array();
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addSelectColumn(ContentPeer::CON_ID);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
$oCriteria->add(ContentPeer::CON_CATEGORY, 'GRP_TITLE');
$oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
$oCriteria->addJoin(ContentPeer::CON_ID, GroupwfPeer::GRP_UID);
$oDataset = ContentPeer::doSelectRS($oCriteria);
$oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$oDataset = GroupwfPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
@@ -4779,7 +4772,7 @@ class Processes
if (is_array($sGroupList)) {
foreach ($aGroupwf as $groupBase) {
foreach ($sGroupList as $group) {
if ($groupBase['CON_VALUE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
if ($groupBase['GRP_TITLE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
$oPro = GroupwfPeer::retrieveByPk( $group['GRP_UID'] );
if(is_object( $oPro ) && get_class( $oPro ) == 'Groupwf') {
$group['GRP_UID'] = G::generateUniqueID();
@@ -4843,12 +4836,8 @@ class Processes
{
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addSelectColumn(ContentPeer::CON_ID);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
$oCriteria->add(ContentPeer::CON_CATEGORY, 'GRP_TITLE');
$oCriteria->add(ContentPeer::CON_LANG, 'en');
$oCriteria->addJoin(ContentPeer::CON_ID, GroupwfPeer::GRP_UID);
$oDataset = ContentPeer::doSelectRS($oCriteria);
$oCriteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$oDataset = GroupwfPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
@@ -4859,7 +4848,7 @@ class Processes
foreach ($sGroupList as $group) {
$merged = false;
foreach ($aGroupwf as $groupBase) {
if ($groupBase['CON_VALUE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
if ($groupBase['GRP_TITLE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
$group['GRP_UID'] = $groupBase['CON_ID'];
$mergedGroupList[] = $group;
$merged = true;