Roles duplicity validation fix.

2011-02-25 18:04:30 +00:00
parent 7e62169902
commit 2d84a01517
2 changed files with 408 additions and 402 deletions
--- a/workflow/engine/methods/roles/roles_Ajax.php
+++ b/workflow/engine/methods/roles/roles_Ajax.php
@@ -312,9 +312,13 @@ switch ($REQUEST) {
    break;
  case 'checkRoleCode':
    $rol_code = $_POST['ROL_CODE'];
+    $rol_uid = isset($_POST['ROL_UID'])? $_POST['ROL_UID']: '';
    $oCriteria = new Criteria('rbac');
    $oCriteria->addSelectColumn(RolesPeer::ROL_UID);
    $oCriteria->add(RolesPeer::ROL_CODE, $rol_code);
+    if ($rol_uid !=''){
+      $oCriteria->add(RolesPeer::ROL_UID, $rol_uid, Criteria::NOT_EQUAL);
+    }
    $oDataset = RolesPeer::doSelectRS($oCriteria);
    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
    if ($oDataset->next()){