fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master' into BUG-13862

Browse Source
This commit is contained in:
norahmollo
2014-01-15 14:36:12 -04:00
parent e5dd8d8582 cb9a8cbe0d
commit 934de813ba
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.bootstrap.php
View File

@@ -30,7 +30,7 @@ class Bootstrap
return;
}
public function registerClass($classname, $includeFile)
public static function registerClass($classname, $includeFile)
{
BootStrap::$includeClassPaths[strtolower($classname)] = $includeFile;
return;

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

@@ -213,7 +213,9 @@ class dynaformEditor extends WebResource
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_HTML"), $sName . '[5]', 'dynaformEditor.changeToHtmlCode', 'dynaformEditor.saveCurrentView');
}
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_FIELDS_LIST"), $sName . '[6]', 'dynaformEditor.changeToFieldsList', 'dynaformEditor.saveCurrentView');
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_JAVASCRIPTS"), $sName . '[7]', 'dynaformEditor.changeToJavascripts', 'dynaformEditor.saveCurrentView');
if ($Properties["DYN_TYPE"] != "grid") {
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_JAVASCRIPTS"), $sName . '[7]', 'dynaformEditor.changeToJavascripts', 'dynaformEditor.saveCurrentView');
}
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_PROPERTIES"), $sName . '[8]', 'dynaformEditor.changeToProperties', 'dynaformEditor.saveCurrentView');
//for showHide tab option @Neyek

5
workflow/engine/classes/class.patch.php
View File

@@ -2,7 +2,6 @@
G::LoadClass("Task");
G::LoadClass("TaskUser");
G::LoadClass("System");
/**
* class, helping to set some not desirable settings but necesary
@@ -26,6 +25,10 @@ class p11835 extends patch
*/
static public function isApplicable()
{
if (! class_exists('System')) {
G::LoadClass("System");
}
patch::$isPathchable = false;
$con = Propel::getConnection("workflow");
$stmt = $con->prepareStatement("describe TASK;");