diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php
index a18a5831a..be5c746cc 100755
--- a/workflow/engine/classes/model/AppCacheView.php
+++ b/workflow/engine/classes/model/AppCacheView.php
@@ -89,9 +89,11 @@ class AppCacheView extends BaseAppCacheView {
else {
$Criteria = $this->addPMFieldsToCriteria('todo');
}
+ $Criteria->addSelectColumn(AppCacheViewPeer::TAS_UID);
+ $Criteria->addSelectColumn(AppCacheViewPeer::PRO_UID);
+
$Criteria->add (AppCacheViewPeer::APP_STATUS, "TO_DO" , CRITERIA::EQUAL );
$Criteria->add (AppCacheViewPeer::USR_UID, $userUid);
-
$Criteria->add (AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL);
$Criteria->add (AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN');
$Criteria->add (AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN');
diff --git a/workflow/engine/templates/home/indexSingle.html b/workflow/engine/templates/home/indexSingle.html
index 0cd97d43e..10fb75c36 100644
--- a/workflow/engine/templates/home/indexSingle.html
+++ b/workflow/engine/templates/home/indexSingle.html
@@ -43,21 +43,7 @@
function setCurrent(id)
{
- fireEvent(document.getElementById(id), 'click');
- }
-
- function fireEvent(element,event){
- if (document.createEventObject){
- // dispatch for IE
- var evt = document.createEventObject();
- return element.fireEvent('on'+event,evt)
- }
- else{
- // dispatch for firefox + others
- var evt = document.createEvent("HTMLEvents");
- evt.initEvent(event, true, true ); // event type,bubbling,cancelable
- return !element.dispatchEvent(evt);
- }
+ $('#' + id).trigger('click');
}
@@ -67,7 +53,7 @@
-
+
{foreach from=$steps key=i item=step}
@@ -79,7 +65,7 @@
-
+