fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2013-09-23 10:42:14 -04:00
parent 49aba0106a 1807b6f5a9
commit 6940a9981f
5 changed files with 843 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -210,7 +210,6 @@ class Installer
fclose($fp);
$this->setPartner();
$this->setConfiguration();
$this->setAdmin();
}
return $test;

3
workflow/engine/classes/class.processMap.php
View File

@@ -403,8 +403,7 @@ class processMap
case 'text':
$oText = null;
$oText->uid = $aRow['SWI_UID'];
$oText->label = htmlentities(($aRow['CON_VALUE'] != '' ? str_replace(chr(92), '&#92;', str_replace('<', '&lt;', $aRow['CON_VALUE'])) : '-'), ENT_QUOTES, 'UTF-8');
// $oText->label = '->' . $aRow ['CON_VALUE'] . '<-' ;
$oText->label = $aRow ['CON_VALUE'];
$oText->position->x = $aRow['SWI_X'];
$oText->position->y = $aRow['SWI_Y'];
$oPM->text[] = $oText;

9
workflow/engine/js/processmap/core/processmap.js
View File

@@ -2112,7 +2112,8 @@ var processmap=function(){
left:text.position.x,
cursor:((this.options.rw===true)?"move":"default")
});
a.innerHTML=text.label;
a.appendChild(document.createTextNode(''));
a.childNodes[0].data=text.label;
this.panels.editor.elements.content.appendChild(a);
if(this.options.rw===true)
{
@@ -2136,14 +2137,14 @@ var processmap=function(){
}*/
new this.parent.module.app.prompt().make({
label:G_STRINGS.ID_PROCESSMAP_EDIT_TEXT_CHANGE_TO,
value:text.label.escapeHTML(),
value:text.label,
action:function(text,tObj){
if(text.trim()!=="" && tObj.label!=text)
{
tObj.label = tObj.object.elements.label.innerHTML=text.escapeHTML();
tObj.label = tObj.object.elements.label.childNodes[0].data = text;
var r = new leimnud.module.rpc.xmlhttp({
url : this.options.dataServer,
args : "action=updateText&data="+{uid:tObj.uid,label:tObj.label.unescapeHTML()}.toJSONString()
args : "action=updateText&data="+{uid:tObj.uid,label:tObj.label}.toJSONString()
});
r.make();
}

34
workflow/engine/templates/pmTables/editReport.js
View File

@@ -409,6 +409,8 @@ Ext.onReady(function(){
Ext.getCmp("sizeEdit").disable();
Ext.getCmp("sizeEdit").setValue("");
}
flagShowMessageError = 1;
}
}//select
}
@@ -481,13 +483,45 @@ Ext.onReady(function(){
]
});
//row editor for table columns grid
var flagShowMessageError = 1;
editor = new Ext.ux.grid.RowEditor({
saveText: _("ID_UPDATE"),
isValid: function()
{
var valid = true;
this.items.each(function(f) {
if(!f.isValid(true)){
valid = false;
if (valid) {
flagShowMessageError = 1;
}
return false;
}
});
if (valid) {
flagShowMessageError = 1;
}
return valid;
},
showTooltip: function (msg)
{
if (flagShowMessageError == 1) {
Ext.msgBoxSlider.msgTopCenter("error", _("ID_ERROR"), msg, 3);
flagShowMessageError = 0;
}
},
listeners: {
canceledit: function(grid,obj){
if ( grid.record.data.field_label == '' && grid.record.data.field_name == '') {
store.remove(grid.record);
}
flagShowMessageError = 1;
}
}
});