HOR-799: Grupos duplicados al importar proceso
. . . . adicion de validacion
This commit is contained in:
@@ -4778,6 +4778,10 @@ class Processes
|
|||||||
foreach ($aGroupwf as $groupBase) {
|
foreach ($aGroupwf as $groupBase) {
|
||||||
foreach ($sGroupList as $group) {
|
foreach ($sGroupList as $group) {
|
||||||
if ($groupBase['CON_VALUE'] == $group['GRP_TITLE'] && $groupBase['CON_ID'] != $group['GRP_UID']) {
|
if ($groupBase['CON_VALUE'] == $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();
|
||||||
|
}
|
||||||
$existingGroupList[] = $group;
|
$existingGroupList[] = $group;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4808,15 +4812,9 @@ class Processes
|
|||||||
foreach ($sGroupList as $groupBase) {
|
foreach ($sGroupList as $groupBase) {
|
||||||
foreach ($checkedGroup as $group) {
|
foreach ($checkedGroup as $group) {
|
||||||
if ($groupBase['GRP_TITLE'] == $group['GRP_TITLE']) {
|
if ($groupBase['GRP_TITLE'] == $group['GRP_TITLE']) {
|
||||||
$index = substr($groupBase['GRP_TITLE'], -1, 0);
|
$groupBase['GRP_TITLE'] = $groupBase['GRP_TITLE'] .' '. date('Y-m-d H:i:s');
|
||||||
if (is_int($index)) {
|
$groupBase['GRP_UID'] = $group['GRP_UID'];
|
||||||
$index++;
|
|
||||||
} else {
|
|
||||||
$index = 1;
|
|
||||||
}
|
|
||||||
$groupBase['GRP_TITLE'] = $groupBase['GRP_TITLE'] . $index;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
$renamedGroupList[] = $groupBase;
|
$renamedGroupList[] = $groupBase;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user