diff --git a/workflow/engine/classes/model/Translation.php b/workflow/engine/classes/model/Translation.php index 7d647513c..2b1df119e 100755 --- a/workflow/engine/classes/model/Translation.php +++ b/workflow/engine/classes/model/Translation.php @@ -207,7 +207,7 @@ class Translation extends BaseTranslation $c->add( TranslationPeer::TRN_ID, '%ID_MAFE_%', Criteria::LIKE ); $c->addAscendingOrderByColumn( 'TRN_CATEGORY' ); $c->addAscendingOrderByColumn( 'TRN_ID' ); - $c->addAscendingOrderByColumn( 'TRN_LANG' ); + //$c->addAscendingOrderByColumn( 'TRN_LANG' ); $tranlations = TranslationPeer::doSelect( $c ); $mafeFolder = PATH_HTML . "translations"; diff --git a/workflow/engine/js/stagesmap/core/stagesmap.js b/workflow/engine/js/stagesmap/core/stagesmap.js deleted file mode 100755 index 0f1dd8faf..000000000 --- a/workflow/engine/js/stagesmap/core/stagesmap.js +++ /dev/null @@ -1,516 +0,0 @@ -var stagesmap=function(){ - var menu_edit_items = []; - this.data={ - load:function(){ - var r = new leimnud.module.rpc.xmlhttp({ - url:this.options.dataServer, - args:"action=load&data="+{uid:this.options.uid,mode:this.options.rw}.toJSONString() - }); - r.callback=this.data.render.base; - r.make(); - }, - render:{ - base:function(xml) { - this.panels.editor.loader.hide(); - this.data.db=xml.xmlhttp.responseText.parseJSON().concatMaborak({}); - if (this.options.rw===true) { - this.menu = new this.parent.module.app.menuRight(); - this.menu.make({ - target:this.panels.editor.elements.content,//posiblemente hay que cambiar algo aqui para el menu contextual - width:150, - theme:this.options.theme, - menu:[ - {image:"/images/add.png",text:G_STRINGS.ID_PROCESSMAP_ADD_STAGE,launch:this.addStage.extend(this)} - ] - }); - menu_add = this.menu; - this.observers.menu.register(this.parent.closure({instance:this.menu,method:this.menu.remove}),this.menu); - } - this.data.render.title(); - this.data.render.stage(); - this.data.render.derivation(); - }, - stage:function() { - var lngt = this.data.db.stages.length; - for(var i =0;i1)?'derivationBottom':'derivation'; - this.parent.dom.setStyle(stage.object.elements[target],{ - background:"url("+this.options.images_dir+derivation.stage+((target=="derivationBottom")?"bb.jpg":".gif")+"?aa="+Math.random()+")" - }); - } - else - { - var uid = this.tools.getIndexOfUid(derivation.stage); - var stageF= stage.object.elements; - var stageT= this.data.db.stages[uid].object.elements; - var from = stage.object.elements.derivation; - var toStage=this.data.db.stages[uid]; - var to = toStage.object.elements.stage; - if(stage.derivation.type!==5) - { - this.parent.dom.setStyle(stage.object.elements.derivation,{ - background:"url("+this.options.images_dir+stage.derivation.type+"t.gif?aa="+Math.random()+")" - }); - } - else - { - var ij = toStage.object.inJoin; - ij = (ij)?ij+1:1; - toStage.object.inJoin = ij; - this.parent.dom.setStyle(toStage.object.elements.init,{ - background:"url("+this.options.images_dir+stage.derivation.type+"t.gif?aa="+Math.random()+")", - backgroundPosition:"2 0", - backgroundRepeat:"no-repeat" - }); - } - var line = new this.parent.module.app.line({ - indexRootSize:30, - indexRootLastSize:35, - elements:[stageF.stage,stageT.stage], - envolve:[ - [stageF.stage], - [] - ], - target:this.panels.editor.elements.content, - color:"#228AB0", - startA:50, - zIndex:5 - }); - line.make(); - var cE=this.observers.lineas.register(line.update,line); - derivation.object={ - line : line, - indexObserver : cE - }; - } - } - }, - deleteDerivation:function(uid,rec,spec) { - var stage = this.data.db.stages[this.tools.getIndexOfUid(uid)]; - spec = (typeof spec!=="number")?false:spec; - var deri = stage.derivation; - for(var i=0;i - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file