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

BUG 9609 Change log y View en Dynaforms no muestra valores ingresados en formularios ... SOLVED

Browse Source 
- Al momento de recuperar los permisos de los dynaforms, se estaba filtrando 2 veces por el UID de la tarea, esto e sinnecesario porque la funcion que recupera los permisos ya valida por la tarea
- Habian otros issues menores (como el titulo del formulario en los tabs de preview)
- Se quito la dobre validacion por tarea y se corrigieron los issues menores
This commit is contained in:
Julio Cesar Laura
2012-08-21 09:53:15 -04:00
parent 612819cb75
commit 9c72fbddeb
6 changed files with 142 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
workflow/engine/classes/class.case.php
View File

@@ -4631,16 +4631,26 @@ class Cases
//permissions per user //permissions per user
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->add( $oCriteria->add(
$oCriteria->getNewCriterion(ObjectPermissionPeer::USR_UID, $USR_UID)-> $oCriteria->getNewCriterion(ObjectPermissionPeer::USR_UID, $USR_UID)->addOr(
addOr($oCriteria->getNewCriterion(ObjectPermissionPeer::USR_UID, '')) $oCriteria->getNewCriterion(ObjectPermissionPeer::USR_UID, '')->addOr(
$oCriteria->getNewCriterion(ObjectPermissionPeer::USR_UID, '0')
)
)
); );
$oCriteria->add(ObjectPermissionPeer::PRO_UID, $PRO_UID); $oCriteria->add(ObjectPermissionPeer::PRO_UID, $PRO_UID);
$oCriteria->add(ObjectPermissionPeer::OP_ACTION, $ACTION); $oCriteria->add(ObjectPermissionPeer::OP_ACTION, $ACTION);
$oCriteria->add( $oCriteria->add(
$oCriteria->getNewCriterion(ObjectPermissionPeer::TAS_UID, $TAS_UID)-> $oCriteria->getNewCriterion(ObjectPermissionPeer::TAS_UID, $TAS_UID)->addOr(
addOr($oCriteria->getNewCriterion(ObjectPermissionPeer::TAS_UID, '')-> $oCriteria->getNewCriterion(ObjectPermissionPeer::TAS_UID, '')->addOr(
addOr($oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, ''))-> $oCriteria->getNewCriterion(ObjectPermissionPeer::TAS_UID, '0')
addOr($oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, 'ALL'))) )
)->addOr(
$oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, 'ALL')->addOr(
$oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, '')->addOr(
$oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, '0')
)
)
)
); );
$rs = ObjectPermissionPeer::doSelectRS($oCriteria); $rs = ObjectPermissionPeer::doSelectRS($oCriteria);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -4665,10 +4675,17 @@ class Cases
$oCriteria->add(ObjectPermissionPeer::PRO_UID, $PRO_UID); $oCriteria->add(ObjectPermissionPeer::PRO_UID, $PRO_UID);
$oCriteria->add(ObjectPermissionPeer::OP_ACTION, $ACTION); $oCriteria->add(ObjectPermissionPeer::OP_ACTION, $ACTION);
$oCriteria->add( $oCriteria->add(
$oCriteria->getNewCriterion(ObjectPermissionPeer::TAS_UID, $TAS_UID)-> $oCriteria->getNewCriterion(ObjectPermissionPeer::TAS_UID, $TAS_UID)->addOr(
addOr($oCriteria->getNewCriterion(ObjectPermissionPeer::TAS_UID, '')-> $oCriteria->getNewCriterion(ObjectPermissionPeer::TAS_UID, '')->addOr(
addOr($oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, ''))-> $oCriteria->getNewCriterion(ObjectPermissionPeer::TAS_UID, '0')
addOr($oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, 'ALL'))) )
)->addOr(
$oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, 'ALL')->addOr(
$oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, '')->addOr(
$oCriteria->getNewCriterion(ObjectPermissionPeer::OP_CASE_STATUS, '0')
)
)
)
); );
$rs = ObjectPermissionPeer::doSelectRS($oCriteria); $rs = ObjectPermissionPeer::doSelectRS($oCriteria);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -4690,7 +4707,7 @@ class Cases
// here!,. we should verify $PARTICIPATE // here!,. we should verify $PARTICIPATE
$sw_participate = false; // must be false for default $sw_participate = false; // must be false for default
if (($row['OP_CASE_STATUS'] != 'COMPLETED') && ($row['OP_CASE_STATUS'] != '')) { if (($row['OP_CASE_STATUS'] != 'COMPLETED') && ($row['OP_CASE_STATUS'] != '') && ($row['OP_CASE_STATUS'] != '0')) {
if ($PARTICIPATE == 1) { if ($PARTICIPATE == 1) {
$oCriteriax = new Criteria('workflow'); $oCriteriax = new Criteria('workflow');
$oCriteriax->add(AppDelegationPeer::USR_UID, $USR_UID); $oCriteriax->add(AppDelegationPeer::USR_UID, $USR_UID);
@@ -4772,7 +4789,7 @@ class Cases
$oCriteria->add(StepPeer::TAS_UID, $TASK_SOURCE); $oCriteria->add(StepPeer::TAS_UID, $TASK_SOURCE);
} }
} }
if ($O_UID != '') { if ($O_UID != '' && $O_UID != '0') {
$oCriteria->add(DynaformPeer::DYN_UID, $O_UID); $oCriteria->add(DynaformPeer::DYN_UID, $O_UID);
} }
$oCriteria->addJoin(ApplicationPeer::PRO_UID, StepPeer::PRO_UID); $oCriteria->addJoin(ApplicationPeer::PRO_UID, StepPeer::PRO_UID);
@@ -4809,7 +4826,7 @@ class Cases
$oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE); $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE);
} }
} }
if ($O_UID != '') { if ($O_UID != '' && $O_UID != '0') {
$oCriteria->add(AppDocumentPeer::DOC_UID, $O_UID); $oCriteria->add(AppDocumentPeer::DOC_UID, $O_UID);
} }
if ($obj_type == 'INPUT') { if ($obj_type == 'INPUT') {

1
workflow/engine/classes/class.groups.php
View File

@@ -224,6 +224,7 @@ class Groups
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS); $oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
$oCriteria->addSelectColumn(GroupwfPeer::GRP_LDAP_DN);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE); $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
$oCriteria->addJoin(GroupUserPeer::GRP_UID, GroupwfPeer::GRP_UID, Criteria::LEFT_JOIN); $oCriteria->addJoin(GroupUserPeer::GRP_UID, GroupwfPeer::GRP_UID, Criteria::LEFT_JOIN);
$oCriteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN); $oCriteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);

1
workflow/engine/classes/model/AppHistory.php
View File

@@ -112,7 +112,6 @@ class AppHistory extends BaseAppHistory {
//WHERE //WHERE
$c->add(AppHistoryPeer::DYN_UID, $aObjectPermissions['DYNAFORMS'], Criteria::IN); $c->add(AppHistoryPeer::DYN_UID, $aObjectPermissions['DYNAFORMS'], Criteria::IN);
$c->add(AppHistoryPeer::PRO_UID, $PRO_UID); $c->add(AppHistoryPeer::PRO_UID, $PRO_UID);
$c->add(AppHistoryPeer::TAS_UID, $TAS_UID);
$c->add(AppHistoryPeer::APP_UID, $APP_UID); $c->add(AppHistoryPeer::APP_UID, $APP_UID);
if((isset($DYN_UID))&&($DYN_UID!="")){ if((isset($DYN_UID))&&($DYN_UID!="")){
$c->add(AppHistoryPeer::DYN_UID, $DYN_UID); $c->add(AppHistoryPeer::DYN_UID, $DYN_UID);

19
workflow/engine/methods/tracker/tracker_ShowDocument.php
View File

@@ -27,21 +27,28 @@
* *
* @author David Callizaya <davidsantos@colosa.com> * @author David Callizaya <davidsantos@colosa.com>
*/ */
if (!isset($_SESSION['PROCESS']))
{ if (!isset($_SESSION['PROCESS'])) {
G::header('location: login'); G::header('location: login');
} }
require_once ( "classes/model/AppDocumentPeer.php" ); require_once 'classes/model/AppDocumentPeer.php';
$oAppDocument = new AppDocument(); $oAppDocument = new AppDocument();
$oAppDocument->Fields = $oAppDocument->load($_GET['a']); $oAppDocument->Fields = $oAppDocument->load($_GET['a']);
$sAppDocUid = $oAppDocument->getAppDocUid(); $sAppDocUid = $oAppDocument->getAppDocUid();
$info = pathinfo($oAppDocument->getAppDocFilename()); $info = pathinfo($oAppDocument->getAppDocFilename());
$iDocVersion = $oAppDocument->getDocVersion();
$ext = $info['extension']; $ext = $info['extension'];
$realPath = PATH_DOCUMENT . $_SESSION['APPLICATION'] . '/' . $sAppDocUid . '.' . $ext ; $realPath = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/' . $sAppDocUid .'_'.$iDocVersion . '.' . $ext;
if (!file_exists($realPath)) {
$realPath = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/' . $sAppDocUid . '.' . $ext;
}
if (!file_exists($realPath)) {
G::streamFile($realPath, true, $oAppDocument->Fields['APP_DOC_FILENAME']); G::streamFile($realPath, true, $oAppDocument->Fields['APP_DOC_FILENAME']);
}
?> else {
die("'" . $oAppDocument->Fields['APP_DOC_FILENAME'] . "' " . G::LoadTranslation('ID_ERROR_STREAMING_FILE'));
}

2
workflow/engine/templates/cases/cases_DynaformHistory.html
View File

@@ -65,7 +65,7 @@
<td width="20%">{dynDate}</td> <td width="20%">{dynDate}</td>
<td width="20%">{dynUser}</td> <td width="20%">{dynUser}</td>
<td width="20%"><div class="userGroupLink"><a href="javascript:toggleTable('{tablename}');">{dynChanges}</a></div></td> <td width="20%"><div class="userGroupLink"><a href="javascript:toggleTable('{tablename}');">{dynChanges}</a></div></td>
<td width="10%"><div class="userGroupLink"><a href="javascript:showDynaformHistory('{dynUID}', '{tablename}', '{dynDate}');">{viewForm}</a></div></td> <td width="10%"><div class="userGroupLink"><a href="javascript:showDynaformHistory('{dynUID}', '{tablename}', '{dynDate}', '{dynTitle}');">{viewForm}</a></div></td>
</tr> </tr>
</table> </table>
</td> </td>

4
workflow/engine/templates/cases/cases_DynaformHistory.php
View File

@@ -101,9 +101,9 @@ while ($aRow = $oDataset->getRow()) {
$changeCountA=$changeCount+1; $changeCountA=$changeCount+1;
$tableNameA="_TCHANGE_".$changeCountA; $tableNameA="_TCHANGE_".$changeCountA;
$tpl->assign( "dynTitle" , $aRow['DYN_TITLE'] ); $tpl->assign( "dynTitle" , addslashes($aRow['DYN_TITLE']) );
$tpl->assign( "dynDate" , $aRow['HISTORY_DATE'] ); $tpl->assign( "dynDate" , $aRow['HISTORY_DATE'] );
$tpl->assign( "dynUser" , $aRow['USR_NAME'] ); $tpl->assign( "dynUser" , addslashes($aRow['USR_NAME']) );
$tpl->assign( "changes" , G::LoadTranslation("ID_CHANGES") ); $tpl->assign( "changes" , G::LoadTranslation("ID_CHANGES") );
$tpl->assign( "dynUID" , $aRow['DYN_UID'] ); $tpl->assign( "dynUID" , $aRow['DYN_UID'] );
$tpl->assign( "tablename" , $tableName ); $tpl->assign( "tablename" , $tableName );