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

Merge pull request #2051 from gproly/BUG-12932

Browse Source 
BUG-12932 SOLVED
This commit is contained in:
julceslauhub
2013-09-22 20:57:03 -07:00
parent ec8eb7f0bf fc27023576
commit 1807b6f5a9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -403,8 +403,7 @@ class processMap
case 'text': case 'text':
$oText = null; $oText = null;
$oText->uid = $aRow['SWI_UID']; $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->x = $aRow['SWI_X'];
$oText->position->y = $aRow['SWI_Y']; $oText->position->y = $aRow['SWI_Y'];
$oPM->text[] = $oText; $oPM->text[] = $oText;

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

@@ -2112,7 +2112,8 @@ var processmap=function(){
left:text.position.x, left:text.position.x,
cursor:((this.options.rw===true)?"move":"default") 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); this.panels.editor.elements.content.appendChild(a);
if(this.options.rw===true) if(this.options.rw===true)
{ {
@@ -2136,14 +2137,14 @@ var processmap=function(){
}*/ }*/
new this.parent.module.app.prompt().make({ new this.parent.module.app.prompt().make({
label:G_STRINGS.ID_PROCESSMAP_EDIT_TEXT_CHANGE_TO, label:G_STRINGS.ID_PROCESSMAP_EDIT_TEXT_CHANGE_TO,
value:text.label.escapeHTML(), value:text.label,
action:function(text,tObj){ action:function(text,tObj){
if(text.trim()!=="" && tObj.label!=text) 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({ var r = new leimnud.module.rpc.xmlhttp({
url : this.options.dataServer, 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(); r.make();
} }