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

Merge branch 'master' of github.com:ralpheav/processmaker

Browse Source
This commit is contained in:
ddd
2013-06-05 11:48:18 -04:00
parent b140da984c 86825ff1db
commit 6787c47ba6
7 changed files with 96 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
workflow/engine/classes/class.patch.php Normal file
View File

@@ -0,0 +1,82 @@
<?php
G::LoadClass("Task");
G::LoadClass("TaskUser");
G::LoadClass("System");
/**
* class, helping to set some not desirable settings but necesary
* @author reav
*
*/
class patch
{
static private $isPathchable = false;
/*
* Note.- Use before upgrade DB.
* Check if the table TASK has the field TAS_GROUP_VARIABLE
* @return boolean
*/
static public function is_11835Applicable()
{
patch::$isPathchable = false;
$con = Propel::getConnection("workflow");
$stmt = $con->prepareStatement("describe TASK;");
$rs = $stmt->executeQuery();
$rs->next();
while($row = $rs->getRow()) {
if ($row ['Field'] == "TAS_GROUP_VARIABLE") {
$version = System::getVersion ();
$pos = strpos($version,'2.5.1-testing');
if ($version == '2.5.0.1' || $pos !== false) {
echo "Version ".$version . " Patch\n";
patch::$isPathchable = true;
}
break;
}
$rs->next();
}
return patch::$isPathchable;
}
/*
* Note.- Use after DB was upgraded.
* Set the patch, setting all the TAS_GROUP_VARIABLE to ''
* if the current task has asignated users, means SELF_SERVICE only,
* otherwise leave TAS_GROUP_VARIABLE as it is.
*/
static public function execute_11835()
{
//Check if this is the version to apply the patch
$count = 0;
$task = new Task();
if ( patch::$isPathchable && method_exists($task,'getTasGroupVariable')) {
$con = Propel::getConnection("workflow");
$stmt = $con->prepareStatement("select TAS_UID from TASK;");
$recordSet = $stmt->executeQuery();
$recordSet->next();
$aRow = $recordSet->getRow();
while ($aRow) {
$tasUid = $aRow['TAS_UID'];
$conUser = Propel::getConnection("workflow");
$stmtUser = $conUser->prepareStatement("select * from TASK_USER where TAS_UID = '".$tasUid."';");
$recordSetTaskUser = $stmtUser->executeQuery();
if ($recordSetTaskUser->next()) {
echo "Patching uid: " . $tasUid . "\n";
//Set the values if they match the pattern
$conChange = Propel::getConnection("workflow");
$stmtChange = $conChange->prepareStatement("update TASK set TAS_GROUP_VARIABLE = '' where TAS_UID = '".$tasUid."';");
$recordResult = $stmtChange->executeQuery();
$count++;
}
$recordSet->next();
$aRow = $recordSet->getRow();
}
}
echo $count. " records where patched to use SELF_SERVICE feature.\n";
}
}

10
workflow/engine/classes/class.wsTools.php
View File

@@ -598,13 +598,17 @@ class workspaceTools
* @param bool $checkOnly only check if the upgrade is needed if true
* @return array bool upgradeSchema for more information
*/
public function upgradeDatabase($checkOnly = false)
public function upgradeDatabase ($checkOnly = false)
{
G::LoadClass("patch");
$this->initPropel( true );
patch::is_11835Applicable();
$systemSchema = System::getSystemSchema();
$this->upgradeSchema($systemSchema);
$this->upgradeSchema( $systemSchema );
$this->upgradeData();
patch::execute_11835();
return true;
}
}
/**
* Upgrade this workspace database from a schema

2
workflow/engine/config/schema.xml
View File

@@ -1198,7 +1198,7 @@
<column name="TAS_PRIORITY_VARIABLE" type="VARCHAR" size="100" required="true" default=""/>
<column name="TAS_ASSIGN_TYPE" type="VARCHAR" size="30" required="true" default="BALANCED"/>
<column name="TAS_ASSIGN_VARIABLE" type="VARCHAR" size="100" required="true" default="@@SYS_NEXT_USER_TO_BE_ASSIGNED"/>
<column name="TAS_GROUP_VARIABLE" type="VARCHAR" size="100" required="false" default="@@SYS_GROUP_TO_BE_ASSIGNED"/>
<column name="TAS_GROUP_VARIABLE" type="VARCHAR" size="100" required="false"/>
<column name="TAS_MI_INSTANCE_VARIABLE" type="VARCHAR" size="100" required="true" default="@@SYS_VAR_TOTAL_INSTANCE"/>
<column name="TAS_MI_COMPLETE_VARIABLE" type="VARCHAR" size="100" required="true" default="@@SYS_VAR_TOTAL_INSTANCES_COMPLETE"/>
<column name="TAS_ASSIGN_LOCATION" type="VARCHAR" size="20" required="true" default="FALSE"/>

2
workflow/engine/data/mssql/schema.sql
View File

@@ -1271,7 +1271,7 @@ CREATE TABLE [TASK]
[TAS_PRIORITY_VARIABLE] VARCHAR(100) default '' NOT NULL,
[TAS_ASSIGN_TYPE] VARCHAR(30) default 'BALANCED' NOT NULL,
[TAS_ASSIGN_VARIABLE] VARCHAR(100) default '@@SYS_NEXT_USER_TO_BE_ASSIGNED' NOT NULL,
[TAS_GROUP_VARIABLE] VARCHAR(100) default '@@SYS_GROUP_TO_BE_ASSIGNED' NULL,
[TAS_GROUP_VARIABLE] VARCHAR(100) default '' NULL,
[TAS_MI_INSTANCE_VARIABLE] VARCHAR(100) default '@@SYS_VAR_TOTAL_INSTANCE' NOT NULL,
[TAS_MI_COMPLETE_VARIABLE] VARCHAR(100) default '@@SYS_VAR_TOTAL_INSTANCES_COMPLETE' NOT NULL,
[TAS_ASSIGN_LOCATION] VARCHAR(20) default 'FALSE' NOT NULL,

2
workflow/engine/data/mysql/schema.sql
View File

@@ -568,7 +568,7 @@ CREATE TABLE `TASK`
`TAS_PRIORITY_VARIABLE` VARCHAR(100) default '' NOT NULL,
`TAS_ASSIGN_TYPE` VARCHAR(30) default 'BALANCED' NOT NULL,
`TAS_ASSIGN_VARIABLE` VARCHAR(100) default '@@SYS_NEXT_USER_TO_BE_ASSIGNED' NOT NULL,
`TAS_GROUP_VARIABLE` VARCHAR(100) default '@@SYS_GROUP_TO_BE_ASSIGNED',
`TAS_GROUP_VARIABLE` VARCHAR(100) default '',
`TAS_MI_INSTANCE_VARIABLE` VARCHAR(100) default '@@SYS_VAR_TOTAL_INSTANCE' NOT NULL,
`TAS_MI_COMPLETE_VARIABLE` VARCHAR(100) default '@@SYS_VAR_TOTAL_INSTANCES_COMPLETE' NOT NULL,
`TAS_ASSIGN_LOCATION` VARCHAR(20) default 'FALSE' NOT NULL,

2
workflow/engine/data/oracle/schema.sql
View File

@@ -711,7 +711,7 @@ CREATE TABLE "TASK"
"TAS_PRIORITY_VARIABLE" VARCHAR2(100) default '' NOT NULL,
"TAS_ASSIGN_TYPE" VARCHAR2(30) default 'BALANCED' NOT NULL,
"TAS_ASSIGN_VARIABLE" VARCHAR2(100) default '@@SYS_NEXT_USER_TO_BE_ASSIGNED' NOT NULL,
"TAS_GROUP_VARIABLE" VARCHAR2(100) default '@@SYS_GROUP_TO_BE_ASSIGNED',
"TAS_GROUP_VARIABLE" VARCHAR2(100) default '',
"TAS_MI_INSTANCE_VARIABLE" VARCHAR2(100) default '@@SYS_VAR_TOTAL_INSTANCE' NOT NULL,
"TAS_MI_COMPLETE_VARIABLE" VARCHAR2(100) default '@@SYS_VAR_TOTAL_INSTANCES_COMPLETE' NOT NULL,
"TAS_ASSIGN_LOCATION" VARCHAR2(20) default 'FALSE' NOT NULL,

3
workflow/engine/methods/tasks/tasks_Ajax.php
View File

@@ -69,6 +69,9 @@ try {
}
if ($aData['TAS_ASSIGN_TYPE'] == 'SELF_SERVICE_EVALUATE') {
$aData['TAS_ASSIGN_TYPE'] = 'SELF_SERVICE';
if(trim($aData['TAS_GROUP_VARIABLE']) == '') {
$aData['TAS_GROUP_VARIABLE'] = '@@SYS_GROUP_TO_BE_ASSIGNED';
}
} else {
$aData['TAS_GROUP_VARIABLE'] = '';
}