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

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Victor Saisa Lopez
2014-06-27 14:45:09 -04:00
parent c6c14a1840 e8b63a422a
commit 58c82213f8
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Rakefile
View File

@@ -43,10 +43,12 @@ task :build => [:required] do
pmUIDir = targetDir + "/pmUI" pmUIDir = targetDir + "/pmUI"
mafeDir = targetDir + "/mafe" mafeDir = targetDir + "/mafe"
pmdynaformDir = targetDir + "/pmdynaform"
prepareDirs([pmUIDir, mafeDir, jsTargetDir, cssTargetDir, cssImagesTargetDir, imgTargetDir, pmUIFontsDir]) prepareDirs([pmUIDir, mafeDir, pmdynaformDir, jsTargetDir, cssTargetDir, cssImagesTargetDir, imgTargetDir, pmUIFontsDir])
buildPmUi(Dir.pwd + "/vendor/colosa/pmUI", targetDir, mode) buildPmUi(Dir.pwd + "/vendor/colosa/pmUI", targetDir, mode)
buildPmdynaform(Dir.pwd + "/vendor/colosa/pmDynaform", targetDir, mode)
buildMafe(Dir.pwd + "/vendor/colosa/MichelangeloFE", targetDir, mode) buildMafe(Dir.pwd + "/vendor/colosa/MichelangeloFE", targetDir, mode)
pmuiHash = getHash(Dir.pwd + "/vendor/colosa/pmUI") pmuiHash = getHash(Dir.pwd + "/vendor/colosa/pmUI")
@@ -134,6 +136,20 @@ def buildPmUi(homeDir, targetDir, mode)
puts "\nPMUI Build Finished".magenta puts "\nPMUI Build Finished".magenta
end end
def buildPmdynaform(homeDir, targetDir, mode)
puts "\nBuilding PmDynaform library".green.bold
# Defining target directories
pmdynaformDir = targetDir + "/pmdynaform"
executeInto(homeDir, [ "default"])
system("cp -r #{homeDir}/build #{pmdynaformDir}")
system("cp -r #{homeDir}/libs #{pmdynaformDir}")
puts "\nPmDynaform Build Finished!".magenta
end
def buildMafe(homeDir, targetDir, mode) def buildMafe(homeDir, targetDir, mode)
puts "\nBuilding PM Michelangelo FE".green.bold puts "\nBuilding PM Michelangelo FE".green.bold

3
composer.json
View File

@@ -28,7 +28,8 @@
"jquery/jquery": "1.10.2", "jquery/jquery": "1.10.2",
"underscore/underscore": "1.5.2", "underscore/underscore": "1.5.2",
"colosa/pmUI": "dev-master", "colosa/pmUI": "dev-master",
"colosa/MichelangeloFE": "dev-master" "colosa/MichelangeloFE": "dev-master",
"colosa/pmdynaform": "dev-master"
}, },
"require-dev":{ "require-dev":{
"guzzle/guzzle":"~3.1.1", "guzzle/guzzle":"~3.1.1",

2
workflow/engine/classes/class.dynaformEditor.php
View File

@@ -238,7 +238,7 @@ class dynaformEditor extends WebResource
var DYNAFORM_URL="' . $Parameters['URL'] . '"; var DYNAFORM_URL="' . $Parameters['URL'] . '";
leimnud.event.add(window,"load",function(){ loadEditor(); }); leimnud.event.add(window,"load",function(){ loadEditor(); });
'); ');
$oHeadPublisher->addScriptCode(' var jsMeta;var __usernameLogged__ = "' . (isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '') . '";var SYS_LANG = "' . SYS_LANG . '";var __DYN_UID__ = "' . $this->dyn_uid . '";'); $oHeadPublisher->addScriptCode(' var jsMeta;var __usernameLoggedDE__ = "' . (isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '') . '";var SYS_LANG = "' . SYS_LANG . '";var __DYN_UID__ = "' . $this->dyn_uid . '";');
$arrayParameterAux = $Parameters; $arrayParameterAux = $Parameters;
$arrayParameterAux["DYNAFORM_NAME"] = base64_encode($arrayParameterAux["DYNAFORM_NAME"]); $arrayParameterAux["DYNAFORM_NAME"] = base64_encode($arrayParameterAux["DYNAFORM_NAME"]);

7
workflow/engine/templates/processes/main.js
View File

@@ -416,13 +416,6 @@ Ext.onReady(function(){
text: _('ID_EDIT'), text: _('ID_EDIT'),
iconCls: 'button_menu_ext ss_sprite ss_pencil', iconCls: 'button_menu_ext ss_sprite ss_pencil',
handler: editProcess handler: editProcess
},{
id: 'edit_with_classic_editor',
text: 'Edit with classic editor',
iconCls: 'button_menu_ext ss_sprite ss_pencil',
handler: function() {
editProcess("classic");
}
}, { }, {
id: 'activator2', id: 'activator2',
text: '', text: '',