diff --git a/Rakefile b/Rakefile index b93036c8b..c77f45a42 100644 --- a/Rakefile +++ b/Rakefile @@ -44,6 +44,7 @@ task :build => [:required] do pmUIDir = targetDir + "/pmUI" mafeDir = targetDir + "/mafe" pmdynaformDir = targetDir + "/pmdynaform" + prepareDirs([pmUIDir, mafeDir, pmdynaformDir, jsTargetDir, cssTargetDir, cssImagesTargetDir, imgTargetDir, pmUIFontsDir]) @@ -53,6 +54,7 @@ task :build => [:required] do pmuiHash = getHash(Dir.pwd + "/vendor/colosa/pmUI") mafeHash = getHash(Dir.pwd + "/vendor/colosa/MichelangeloFE") + pmdynaformHash = getHash(Dir.pwd + "/vendor/colosa/pmDynaform") hashVendors = pmuiHash+"-"+mafeHash ## Building minified JS Files @@ -94,7 +96,9 @@ task :build => [:required] do :pmui_ver => getVersion(Dir.pwd + "/vendor/colosa/pmUI"), :pmui_hash => pmuiHash, :mafe_ver => getVersion(Dir.pwd + "/vendor/colosa/MichelangeloFE"), - :mafe_hash => mafeHash + :mafe_hash => mafeHash, + :pmdynaform_ver => getVersion(Dir.pwd + "/vendor/colosa/pmDynaform"), + :pmdynaform_hash => pmdynaformHash } File.open(targetDir+"/versions", 'w+') do |writeFile| writeFile.write versions.to_json @@ -207,7 +211,11 @@ def getVersion(path) version = `rake version` end - return /([0-9\.]{5}+)/.match(version) + if version.lines.count > 1 + version = /([0-9\.]{5}+)/.match(version) + end + + return version.strip end diff --git a/workflow/engine/controllers/main.php b/workflow/engine/controllers/main.php index 6fe75eeed..cc17f84eb 100644 --- a/workflow/engine/controllers/main.php +++ b/workflow/engine/controllers/main.php @@ -735,8 +735,9 @@ class Main extends Controller $versions = json_decode(file_get_contents(PATH_HTML . "lib/versions"), true); $pmuiVer = $versions["pmui_ver"]; $mafeVer = $versions["mafe_ver"]; + $pmdynaformVer = $versions["pmdynaform_ver"]; } else { - $pmuiVer = $mafeVer = "(unknown)"; + $pmuiVer = $mafeVer = $pmdynaformVer = "(unknown)"; } $sysSection = G::loadTranslation('ID_SYSTEM_INFO' ); @@ -751,6 +752,7 @@ class Main extends Controller $properties[] = array ($systemName. ' Ver.', System::getVersion() . $ee, $pmSection); $properties[] = array("PMUI JS Lib. Ver.", $pmuiVer, $pmSection); $properties[] = array("MAFE JS Lib. Ver.", $mafeVer, $pmSection); + $properties[] = array("PM Dynaform JS Lib. Ver.", $pmdynaformVer, $pmSection); if (file_exists(PATH_DATA. 'log/upgrades.log')) { $properties[] = array (G::LoadTranslation('ID_UPGRADES_PATCHES'), '' . G::LoadTranslation( 'ID_UPGRADE_VIEW_LOG') . '' ,$pmSection);