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

Removing some code to Community version

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2014-12-03 10:34:22 -04:00
parent 91ae2eb7a7
commit 9744232d3f
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/bin/tasks/cliUpgrade.php
View File

@@ -40,7 +40,7 @@ EOT
);
CLI::taskOpt("buildACV", "If the option is enabled, performs the Build Cache View.", "ACV", "buildACV");
CLI::taskRun("run_upgrade");
/*----------------------------------********---------------------------------*/
CLI::taskName('unify-database');
CLI::taskDescription(<<<EOT
Unify Rbac, Reports and Workflow databases schemas to match the latest version
@@ -55,8 +55,11 @@ CLI::taskDescription(<<<EOT
changed to match the new ProcessMaker code.
EOT
);
/*----------------------------------********---------------------------------*/
CLI::taskArg('workspace');
/*----------------------------------********---------------------------------*/
CLI::taskRun("run_unify_database");
/*----------------------------------********---------------------------------*/
/**
* A version of rm_dir which does not exits on error.
@@ -194,7 +197,7 @@ function listFiles($dir) {
}
return $files;
}
/*----------------------------------********---------------------------------*/
function run_unify_database($args)
{
$workspaces = array();
@@ -300,4 +303,5 @@ function run_unify_database($args)
}
}
$flag = G::isPMUnderUpdating(0);
}
}
/*----------------------------------********---------------------------------*/

2
workflow/engine/templates/pmTables/edit.js
View File

@@ -160,12 +160,14 @@ Ext.onReady(function(){
hidden: true,
hideable:false
},
/*----------------------------------********---------------------------------*/
{
id: 'field_index',
dataIndex: 'field_index',
hidden: true,
hideable:false
},
/*----------------------------------********---------------------------------*/
{
id: 'field_null',
dataIndex: 'field_null',

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

@@ -61,8 +61,9 @@ Ext.onReady(function(){
{name : 'CASES_COUNT_TO_DO', type:'float'},
{name : 'CASES_COUNT_COMPLETED', type:'float'},
{name : 'CASES_COUNT_CANCELLED', type:'float'},
{name : 'PROJECT_TYPE', type:'string'},
{name : 'PROJECT_TYPE', type:'string'}/*----------------------------------********---------------------------------*/,
{name : "PRO_TYPE_PROCESS", type: "string"}
/*----------------------------------********---------------------------------*/
]
}),
@@ -218,8 +219,9 @@ Ext.onReady(function(){
{header: _('ID_COMPLETED'), dataIndex: 'CASES_COUNT_COMPLETED', width: 70, align:'right'},
{header: _('ID_CANCELLED'), dataIndex: 'CASES_COUNT_CANCELLED', width: 70, align:'right'},
{header: _('ID_TOTAL_CASES'), dataIndex: 'CASES_COUNT', width: 75,renderer:function(v){return "<b>"+v+"</b>";}, align:'right'},
{header: _('ID_PRO_DEBUG'), dataIndex: 'PRO_DEBUG_LABEL', width: 50, align:'center'},
{header: _('ID_PRO_DEBUG'), dataIndex: 'PRO_DEBUG_LABEL', width: 50, align:'center'}/*----------------------------------********---------------------------------*/,
{header: _("ID_TYPE_PROCESS"), dataIndex: "PRO_TYPE_PROCESS", width: 75, align:"left"}
/*----------------------------------********---------------------------------*/
]
}),
store: store,

2
workflow/engine/xmlform/processes/processes_Edit.html
View File

@@ -74,6 +74,7 @@
<td class="FormLabel" width="{$form_labelWidth}">{$PRO_TRI_REASSIGNED}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_TRI_REASSIGNED}</td>
</tr>
<!--*----------------------------------********---------------------------------*-->
<tr>
<td class="FormLabel" width="{$form_labelWidth}">{$PRO_TRI_UNPAUSED}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_TRI_UNPAUSED}</td>
@@ -82,6 +83,7 @@
<td class="FormLabel" width="{$form_labelWidth}">{$PRO_TYPE_PROCESS}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_TYPE_PROCESS}</td>
</tr>
<!--*----------------------------------********---------------------------------*-->
<tr>
<td class="FormButton" colspan="2" align="center"><br/> {$form.SUBMIT} &nbsp; {$form.BTN_CANCEL} </td>
</tr>

2
workflow/engine/xmlform/processes/processes_Edit.xml
View File

@@ -43,6 +43,7 @@ WHERE
<PRO_TRI_CANCELED type="dropdown"><![CDATA[SELECT TRI_UID, CON_VALUE FROM `TRIGGERS` LEFT JOIN CONTENT ON (TRI_UID = CON_ID AND CON_CATEGORY = 'TRI_TITLE' AND CON_LANG = '@#SYS_LANG') WHERE PRO_UID = '@#PRO_UID' ORDER BY CON_VALUE ASC]]><en><![CDATA[Execute a trigger when a case is cancelled]]><option name=""><![CDATA[- Don't execute anything -]]></option></en></PRO_TRI_CANCELED>
<PRO_TRI_PAUSED type="dropdown"><![CDATA[SELECT TRI_UID, CON_VALUE FROM `TRIGGERS` LEFT JOIN CONTENT ON (TRI_UID = CON_ID AND CON_CATEGORY = 'TRI_TITLE' AND CON_LANG = '@#SYS_LANG') WHERE PRO_UID = '@#PRO_UID' ORDER BY CON_VALUE ASC]]><en><![CDATA[Execute a trigger when a case is paused]]><option name=""><![CDATA[- Don't execute anything -]]></option></en></PRO_TRI_PAUSED>
<PRO_TRI_REASSIGNED type="dropdown"><![CDATA[SELECT TRI_UID, CON_VALUE FROM `TRIGGERS` LEFT JOIN CONTENT ON (TRI_UID = CON_ID AND CON_CATEGORY = 'TRI_TITLE' AND CON_LANG = '@#SYS_LANG') WHERE PRO_UID = '@#PRO_UID' ORDER BY CON_VALUE ASC]]><en><![CDATA[Execute a trigger when a case is reassigned]]><option name=""><![CDATA[- Don't execute anything -]]></option></en></PRO_TRI_REASSIGNED>
<!--*----------------------------------********---------------------------------*-->
<PRO_TRI_UNPAUSED type="dropdown" required="0" readonly="0" optgroup="0" mode="edit">
<![CDATA[
SELECT TRI_UID, CON_VALUE
@@ -61,6 +62,7 @@ WHERE
<option name="PRIVATE">Private</option>
</en>
</PRO_TYPE_PROCESS>
<!--*----------------------------------********---------------------------------*-->
<BTN_CANCEL type="button" onclick="cancel();">
<en><![CDATA[Cancel]]></en>
</BTN_CANCEL>