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

Merge remote branch 'upstream/master' into BUG-10852

Browse Source
This commit is contained in:
Hector Cortez
2013-04-22 14:36:22 -04:00
parent d173cdcd66 fe8d2ac2f9
commit fe2a36a417
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/class.pmScript.php
View File

@@ -335,9 +335,12 @@ class PMScript
for ($i = 0; $i < $iOcurrences; $i ++) { for ($i = 0; $i < $iOcurrences; $i ++) {
// if the variables for that condition has not been previously defined then $variableIsDefined // if the variables for that condition has not been previously defined then $variableIsDefined
// is set to false // is set to false
if (! isset( $this->aFields[$aMatch[2][$i][0]] )) { if (!isset($this->aFields[$aMatch[2][$i][0]]) && !isset($aMatch[5][$i][0])) {
// $variableIsDefined = false;
$this->aFields[$aMatch[2][$i][0]] = ''; $this->aFields[$aMatch[2][$i][0]] = '';
} else {
if (!isset($this->aFields[$aMatch[2][$i][0]])) {
eval("\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . " = '';");
}
} }
$sAux = substr( $this->sScript, $iAux, $aMatch[0][$i][1] - $iAux ); $sAux = substr( $this->sScript, $iAux, $aMatch[0][$i][1] - $iAux );
if (! $bEqual) { if (! $bEqual) {

7
workflow/engine/templates/admin/pmLogo.html
View File

@@ -72,7 +72,7 @@
display : inline; display : inline;
margin : 4px; margin : 4px;
margin-right : 0; margin-right : 0;
padding : 5px; padding : 22px;
border : 1px solid white; border : 1px solid white;
} }
#images-view .thumb-wrap span { #images-view .thumb-wrap span {
@@ -84,7 +84,7 @@
border : 1px solid #99bbe8; border : 1px solid #99bbe8;
opacity : 0.5; opacity : 0.5;
background : #efefef url(/images/ext/row-over.gif) repeat-x left top; background : #efefef url(/images/ext/row-over.gif) repeat-x left top;
padding : 5px; padding : 22px;
} }
@@ -92,7 +92,8 @@
border : 1px solid #99bbe8; border : 1px solid #99bbe8;
background : #eff5fb url(/images/select-icon.png) no-repeat right bottom; background : #eff5fb url(/images/select-icon.png) no-repeat right bottom;
opacity : 0.5; opacity : 0.5;
padding : 5px; padding : 22px;
text-align : center;
} }
#images-view .x-view-selected .thumb { #images-view .x-view-selected .thumb {
background : transparent; background : transparent;

1
workflow/engine/templates/admin/pmLogo.js
View File

@@ -182,6 +182,7 @@ Ext.onReady(function() {
autoHeight : false, autoHeight : false,
height : 800, height : 800,
multiSelect : true, multiSelect : true,
autoScroll: true,
overClass : 'x-view-over', overClass : 'x-view-over',
itemSelector: 'div.thumb-wrap', itemSelector: 'div.thumb-wrap',
emptyText : _('ID_NO_IMAGES_TO_DISPLAY'), emptyText : _('ID_NO_IMAGES_TO_DISPLAY'),

3
workflow/engine/templates/cases/open.js
View File

@@ -121,7 +121,7 @@ Ext.onReady(function(){
var actionMenu = Ext.getCmp('actionMenu'); var actionMenu = Ext.getCmp('actionMenu');
actionMenu.menu.removeAll(); actionMenu.menu.removeAll();
for(j=0; j<data[i].options.length; j++) { for(j=0; j<data[i].options.length; j++) {
if(!data[i].options[j].hide){ if(!data[i].options[j].hide){
actionMenu.menu.add({ actionMenu.menu.add({
text: data[i].options[j].text, text: data[i].options[j].text,
handler: data[i].options[j].fn != '' ? Actions[data[i].options[j].fn] : function(){} handler: data[i].options[j].fn != '' ? Actions[data[i].options[j].fn] : function(){}
@@ -759,6 +759,7 @@ Ext.onReady(function(){
autoScroll:true, autoScroll:true,
modal: true, modal: true,
maximizable: false, maximizable: false,
resizable: false,
items: [frm] items: [frm]
}); });
win.show(); win.show();