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

Merge pull request #69 from marcoAntonioNina/BUG-9210

Browse Source 
BUG 9210 User experience Single Application SOLVED
This commit is contained in:
julceslauhub
2012-06-14 09:09:27 -07:00
parent 4a7d07424f 890e2dcad3
commit 1899262440
2 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/model/AppCacheView.php
View File

@@ -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');

21
workflow/engine/templates/home/indexSingle.html
View File

@@ -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');
}
</script>
@@ -67,7 +53,7 @@
<body onload="resize()" onresize="resize()" >
<div style="top:40px;"/>
<div id="global-nav-2" class="global-nav-2">
<!-- start topbar -->
<!-- start topbar -->
<ul class="xbreadcrumbs" id="breadcrumbs-1">
{foreach from=$steps key=i item=step}
@@ -79,7 +65,7 @@
<a id="signout-link" href="home/login" title="Sign out"><img src="/images/simplified/logout-grey.png" /></a>
<!-- end topbar -->
<!-- end topbar -->
</div>
<iframe id="iframex" name="iframex" src="{$default_url}" width="100%" height="800" scrolling="yes" frameborder="0"></iframe>
@@ -92,7 +78,6 @@
{literal}
<script type="text/javascript">
console.log($(window).width());
$(document).ready(function() {
$('#breadcrumbs-1').xBreadcrumbs({ collapsible: ($(window).width() < 500 ? true : false)});
});