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

PM-1039 Aniadiendo files para a obviar codigo en la version community.

Browse Source
This commit is contained in:
jennylee
2014-12-04 10:23:06 -04:00
parent f95ec2b11a
commit 4a6f3930b5
14 changed files with 64 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,11 +225,13 @@ class headPublisher
}
$head = $head . "
<!--//////////////////////////////////********//////////////////////////////////-->
<noscript>
<div>
". G::LoadTranslation( 'ID_ERROR_JS_NOT_AVAILABLE' )."
</div>
</noscript>
<!--//////////////////////////////////********//////////////////////////////////-->
<script type=\"text/javascript\">
var BROWSER_CACHE_FILES_UID = \"" . G::browserCacheFilesGetUid() . "\";

9
workflow/engine/bin/cron_single.php
View File

@@ -127,10 +127,12 @@ Bootstrap::registerClass('AppCacheView', PATH_HOME . "engine/classes/model
Bootstrap::registerClass('BaseAppCacheViewPeer',PATH_HOME . "engine/classes/model/om/BaseAppCacheViewPeer.php");
Bootstrap::registerClass('AppCacheViewPeer', PATH_HOME . "engine/classes/model/AppCacheViewPeer.php");
/*----------------------------------********---------------------------------*/
Bootstrap::registerClass('BaseAppTimeoutActionExecuted', PATH_HOME . "engine/classes/model/om/BaseAppTimeoutActionExecuted.php");
Bootstrap::registerClass('AppTimeoutActionExecuted', PATH_HOME . "engine/classes/model/AppTimeoutActionExecuted.php");
Bootstrap::registerClass('BaseAppTimeoutActionExecutedPeer',PATH_HOME . "engine/classes/model/om/BaseAppTimeoutActionExecutedPeer.php");
Bootstrap::registerClass('AppTimeoutActionExecutedPeer', PATH_HOME . "engine/classes/model/AppTimeoutActionExecutedPeer.php");
/*----------------------------------********---------------------------------*/
Bootstrap::registerClass('BaseInputDocument', PATH_HOME . "engine/classes/model/om/BaseInputDocument.php");
Bootstrap::registerClass('InputDocument', PATH_HOME . "engine/classes/model/InputDocument.php");
@@ -798,7 +800,9 @@ function executeCaseSelfService()
$criteria->addSelectColumn(TaskPeer::TAS_SELFSERVICE_TIME);
$criteria->addSelectColumn(TaskPeer::TAS_SELFSERVICE_TIME_UNIT);
$criteria->addSelectColumn(TaskPeer::TAS_SELFSERVICE_TRIGGER_UID);
/*----------------------------------********---------------------------------*/
$criteria->addSelectColumn(TaskPeer::TAS_SELFSERVICE_EXECUTION);
/*----------------------------------********---------------------------------*/
//FROM
$condition = array();
@@ -833,6 +837,7 @@ function executeCaseSelfService()
$taskSelfServiceTime = intval($row["TAS_SELFSERVICE_TIME"]);
$taskSelfServiceTimeUnit = $row["TAS_SELFSERVICE_TIME_UNIT"];
$taskSelfServiceTriggerUid = $row["TAS_SELFSERVICE_TRIGGER_UID"];
/*----------------------------------********---------------------------------*/
$taskSelfServiceJustOneExecution = $row["TAS_SELFSERVICE_EXECUTION"];
if($taskSelfServiceJustOneExecution == 'ONCE'){
@@ -849,6 +854,7 @@ function executeCaseSelfService()
$flag = true; //already executed
}
}
/*----------------------------------********---------------------------------*/
if ($calendar->pmCalendarUid == '') {
$calendar->getCalendar(null, $appcacheProUid, $taskUid);
@@ -904,6 +910,7 @@ function executeCaseSelfService()
$oPMScript->setScript($row["TRI_WEBBOT"]);
$oPMScript->execute();
/*----------------------------------********---------------------------------*/
//saving the case`s data if the 'Execution' is set in ONCE.
if($taskSelfServiceJustOneExecution == "ONCE"){
$oAppTimeoutActionExecuted = new AppTimeoutActionExecuted();
@@ -913,7 +920,7 @@ function executeCaseSelfService()
$dataSelf["EXECUTION_DATE"] = time();
$oAppTimeoutActionExecuted->create($dataSelf);
}
/*----------------------------------********---------------------------------*/
$appFields["APP_DATA"] = array_merge($appFields["APP_DATA"], $oPMScript->aFields);
unset($appFields['APP_STATUS']);

16
workflow/engine/classes/class.case.php
View File

@@ -5167,8 +5167,10 @@ class Cases
"INPUT" => Array(),
"OUTPUT" => Array(),
"CASES_NOTES" => 0,
"MSGS_HISTORY" => Array(),
"SUMMARY_FORM" => 0
"MSGS_HISTORY" => Array()
/*----------------------------------********---------------------------------*/
,"SUMMARY_FORM" => 0
/*----------------------------------********---------------------------------*/
);
//permissions per user
@@ -5327,7 +5329,9 @@ class Cases
}
$RESULT['CASES_NOTES'] = 1;
/*----------------------------------********---------------------------------*/
$RESULT['SUMMARY_FORM'] = 1;
/*----------------------------------********---------------------------------*/
// Message History
$RESULT['MSGS_HISTORY'] = array('PERMISSION' => $ACTION);
@@ -5475,9 +5479,11 @@ class Cases
case 'CASES_NOTES':
$RESULT['CASES_NOTES'] = 1;
break;
/*----------------------------------********---------------------------------*/
case 'SUMMARY_FORM':
$RESULT['SUMMARY_FORM'] = 1;
break;
/*----------------------------------********---------------------------------*/
case 'MSGS_HISTORY':
// Permission
$RESULT['MSGS_HISTORY'] = array('PERMISSION' => $ACTION);
@@ -5529,8 +5535,10 @@ class Cases
"INPUT_DOCUMENTS" => $RESULT['INPUT'],
"OUTPUT_DOCUMENTS" => $RESULT['OUTPUT'],
"CASES_NOTES" => $RESULT['CASES_NOTES'],
"MSGS_HISTORY" => $RESULT['MSGS_HISTORY'],
"SUMMARY_FORM" => $RESULT['SUMMARY_FORM']
"MSGS_HISTORY" => $RESULT['MSGS_HISTORY']
/*----------------------------------********---------------------------------*/
,"SUMMARY_FORM" => $RESULT['SUMMARY_FORM']
/*----------------------------------********---------------------------------*/
);
}

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

@@ -3651,10 +3651,12 @@ class processMap
$sObjectType = G::LoadTranslation('MSGS_HISTORY');
$sObject = G::LoadTranslation('ID_ALL');
break;
/*----------------------------------********---------------------------------*/
case 'SUMMARY_FORM':
$sObjectType = G::LoadTranslation('ID_SUMMARY_FORM');
$sObject = G::LoadTranslation('ID_ALL');
break;
/*----------------------------------********---------------------------------*/
default:
$sObjectType = G::LoadTranslation('ID_ALL');
$sObject = G::LoadTranslation('ID_ALL');

4
workflow/engine/classes/model/map/TaskMapBuilder.php
View File

@@ -156,9 +156,9 @@ class TaskMapBuilder
$tMap->addColumn('TAS_SELFSERVICE_TIME_UNIT', 'TasSelfserviceTimeUnit', 'string', CreoleTypes::VARCHAR, false, 15);
$tMap->addColumn('TAS_SELFSERVICE_TRIGGER_UID', 'TasSelfserviceTriggerUid', 'string', CreoleTypes::VARCHAR, false, 32);
/*----------------------------------********---------------------------------*/
$tMap->addColumn('TAS_SELFSERVICE_EXECUTION', 'TasSelfserviceExecution', 'string', CreoleTypes::VARCHAR, false, 15);
/*----------------------------------********---------------------------------*/
$tMap->addValidator('TAS_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'NORMAL|ADHOC|SUBPROCESS|HIDDEN', 'Please select a valid value for TAS_TYPE.');
$tMap->addValidator('TAS_TIMEUNIT', 'validValues', 'propel.validator.ValidValuesValidator', 'MINUTES|HOURS|DAYS|WEEKS|MONTHS', 'Please select a valid value for TAS_TIMEUNIT.');

2
workflow/engine/js/processmap/core/processes_Map.js
View File

@@ -118,7 +118,9 @@ var saveDataTaskTemporal = function(iForm)
oTaskData.TAS_SELFSERVICE_TIME = (sw == 1)? getField("TAS_SELFSERVICE_TIME").value : "";
oTaskData.TAS_SELFSERVICE_TIME_UNIT = (sw == 1)? getField("TAS_SELFSERVICE_TIME_UNIT").value : "";
oTaskData.TAS_SELFSERVICE_TRIGGER_UID = (sw == 1)? getField("TAS_SELFSERVICE_TRIGGER_UID").value : "";
/*----------------------------------********---------------------------------*/
oTaskData.TAS_SELFSERVICE_EXECUTION = (sw == 1)? getField("TAS_SELFSERVICE_EXECUTION").value : "";
/*----------------------------------********---------------------------------*/
break;
case 3:
case '3':

4
workflow/engine/methods/cases/summary.php
View File

@@ -46,7 +46,7 @@ try {
throw new Exception( G::LoadTranslation( 'ID_NO_PERMISSION_NO_PARTICIPATED' ) );
}
$applicationFields = $case->loadCase( $_REQUEST['APP_UID'], $_REQUEST['DEL_INDEX'] );
/*----------------------------------********---------------------------------*/
$respView = $case->getAllObjectsFrom( $applicationFields['PRO_UID'], $_REQUEST['APP_UID'], $applicationFields['TAS_UID'], $_SESSION['USER_LOGGED'], 'VIEW' );
if ($respView['SUMMARY_FORM'] == 0) {
@@ -56,7 +56,7 @@ try {
G::RenderPage( 'publish', 'blank' );
die();
}
/*----------------------------------********---------------------------------*/
if (file_exists( PATH_DYNAFORM . $applicationFields['PRO_UID'] . PATH_SEP . $_REQUEST['DYN_UID'] . '.xml' )) {
$applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
$applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = '#';

4
workflow/engine/methods/login/login.php
View File

@@ -22,7 +22,7 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
/*----------------------------------********---------------------------------*/
//Browser Compatibility
$browserSupported = G::checkBrowserCompatibility();
if ($browserSupported==false){
@@ -30,7 +30,7 @@ if ($browserSupported==false){
G::SendTemporalMessage ('ID_CURRENT_BROWSER_NOT_SUPPORTED', 'warning');
}
}
/*----------------------------------********---------------------------------*/
$aFields = array();
if (!isset($_GET['u'])) {

3
workflow/engine/methods/login/sysLogin.php
View File

@@ -22,6 +22,7 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
/*----------------------------------********---------------------------------*/
//Browser Compatibility
$browserSupported = G::checkBrowserCompatibility();
if ($browserSupported==false){
@@ -29,7 +30,7 @@ if ($browserSupported==false){
G::SendTemporalMessage ('ID_CURRENT_BROWSER_NOT_SUPPORTED', 'warning');
}
}
/*----------------------------------********---------------------------------*/
if (isset ($_POST['form']['USER_ENV'])) {
@session_destroy();
session_start();

3
workflow/engine/templates/cases/missRequiredFields.php
View File

@@ -72,6 +72,7 @@
$previouspage = $_POST['previous_step']['PAGE'];
$html .= '</td></tr><tr><td align="center">';
/*----------------------------------********---------------------------------*/
if($netxpage == ""){
$html .= '<a href='.$previouspage.'>';
$html .= '<input type="button" value="Back" class="module_app_button___gray" />';
@@ -80,7 +81,7 @@
$html .= '<input type="button" value="Back" class="module_app_button___gray" onclick="javascript:history.back()">';
$html .= '<input type="button" value="Continue" class="module_app_button___gray" onclick="javascript:location.href=\''.$netxpage.'\'">';
}
/*----------------------------------********---------------------------------*/
echo '<div class="grid" style="width:'.$width_content.'">
<div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>

4
workflow/engine/templates/processes/webentryPost.tpl
View File

@@ -137,7 +137,7 @@ try {
* you can change it or redirect to another page
* i.e. G::header("Location: http://www.processmaker.com");
*/
/*----------------------------------********---------------------------------*/
$_POST['__notValidateThisFields__'] = (isset( $_POST['__notValidateThisFields__'] ) && $_POST['__notValidateThisFields__'] != '') ? $_POST['__notValidateThisFields__'] : $_POST['DynaformRequiredFields'];
if ($missing_req_values = $oForm->validateRequiredFields( $_POST['form'], Bootstrap::json_decode( stripslashes( $_POST['__notValidateThisFields__'] ) ) )) {
$fieldsRequired = Bootstrap::json_decode(str_replace(array("%27", "%39"), array("\"", "'"), $_POST["DynaformRequiredFields"]));
@@ -160,7 +160,7 @@ try {
G::RenderPage( 'publish', 'blank' );
exit( 0 );
}
/*----------------------------------********---------------------------------*/
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent("xmlform", "xmlform", "login/showInfo", "", $aMessage);
G::RenderPage("publish", "blank");

14
workflow/engine/xmlform/processes/processes_EditObjectPermission.xml
View File

@@ -45,7 +45,9 @@
<option name="OUTPUT">Output Document</option>
<option name="CASES_NOTES">Cases Notes</option>
<option name="MSGS_HISTORY">Messages History</option>
<!--//////////////////////////////////********//////////////////////////////////-->
<option name="SUMMARY_FORM">Summary Form</option>
<!--//////////////////////////////////********//////////////////////////////////-->
</en>
</OP_OBJ_TYPE>
<ALL type="dropdown" mode="edit" sqlConnection="dbarray">
@@ -188,7 +190,11 @@ if (getField('OP_OBJ_TYPE').value=='OUTPUT') {
hideRowById( 'INPUTS' );
showRowById( 'OP_ACTION' );
}
if (getField('OP_OBJ_TYPE').value=='CASES_NOTES' || getField('OP_OBJ_TYPE').value=='SUMMARY_FORM') {
if (getField('OP_OBJ_TYPE').value=='CASES_NOTES'
/*----------------------------------********---------------------------------*/
|| getField('OP_OBJ_TYPE').value=='SUMMARY_FORM')
/*----------------------------------********---------------------------------*/
{
hideRowById( 'ALL' );
hideRowById( 'DYNAFORMS' );
hideRowById( 'INPUTS' );
@@ -228,7 +234,11 @@ leimnud.event.add(document.getElementById('form[OP_OBJ_TYPE]'), 'change', functi
showRowById( 'OUTPUTS' );
showRowById( 'OP_ACTION' );
}
if (getField('OP_OBJ_TYPE').value=='CASES_NOTES' || getField('OP_OBJ_TYPE').value=='SUMMARY_FORM') {
if (getField('OP_OBJ_TYPE').value=='CASES_NOTES'
/*----------------------------------********---------------------------------*/
|| getField('OP_OBJ_TYPE').value=='SUMMARY_FORM')
/*----------------------------------********---------------------------------*/
{
hideRowById( 'ALL' );
hideRowById( 'DYNAFORMS' );
hideRowById( 'INPUTS' );

6
workflow/engine/xmlform/processes/processes_NewObjectPermission.xml
View File

@@ -45,7 +45,9 @@
<option name="OUTPUT">Output Document</option>
<option name="CASES_NOTES">Cases Notes</option>
<option name="MSGS_HISTORY">Messages History</option>
<!--//////////////////////////////////********//////////////////////////////////-->
<option name="SUMMARY_FORM">Summary Form</option>
<!--//////////////////////////////////********//////////////////////////////////-->
</en>
</OP_OBJ_TYPE>
<ALL type="dropdown" mode="edit" sqlConnection="dbarray">
@@ -172,7 +174,9 @@ leimnud.event.add(getField('OP_OBJ_TYPE'), 'change', function() {
showRowById('OP_ACTION');
break;
case 'CASES_NOTES':
/*----------------------------------********---------------------------------*/
case 'SUMMARY_FORM':
/*----------------------------------********---------------------------------*/
getField('ALL').value = '';
getField('DYNAFORMS').value = '';
getField('INPUTS').value = '';
@@ -248,7 +252,9 @@ switch (vValue) {
showRowById('OP_ACTION');
break;
case 'CASES_NOTES':
/*----------------------------------********---------------------------------*/
case 'SUMMARY_FORM':
/*----------------------------------********---------------------------------*/
getField('ALL').value = '';
getField('DYNAFORMS').value = '';
getField('INPUTS').value = '';

8
workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml
View File

@@ -37,22 +37,28 @@
TGR.TRI_UID = CON.CON_ID AND CON.CON_CATEGORY = 'TRI_TITLE' AND CON.CON_LANG = '@#LANG'
ORDER BY CON.CON_VALUE ASC
]]><en><![CDATA[Trigger to execute]]><option name=""><![CDATA[- Select a trigger -]]></option></en></TAS_SELFSERVICE_TRIGGER_UID>
<!--//////////////////////////////////********//////////////////////////////////-->
<TAS_SELFSERVICE_EXECUTION type="dropdown">
<en><![CDATA[Execute Trigger]]><option name="EVERY_TIME"><![CDATA[Every time scheduled by cron]]></option><option name="ONCE"><![CDATA[Once]]></option></en>
</TAS_SELFSERVICE_EXECUTION>
<!--//////////////////////////////////********//////////////////////////////////-->
<JS type="javascript"><![CDATA[
var selfServiceTimeoutDataShow = function (sw)
{
hideRowById("TAS_SELFSERVICE_TIME");
hideRowById("TAS_SELFSERVICE_TIME_UNIT");
hideRowById("TAS_SELFSERVICE_TRIGGER_UID");
/*----------------------------------********---------------------------------*/
hideRowById("TAS_SELFSERVICE_EXECUTION");
/*----------------------------------********---------------------------------*/
if (sw == true) {
showRowById("TAS_SELFSERVICE_TIME");
showRowById("TAS_SELFSERVICE_TIME_UNIT");
showRowById("TAS_SELFSERVICE_TRIGGER_UID");
/*----------------------------------********---------------------------------*/
showRowById("TAS_SELFSERVICE_EXECUTION");
/*----------------------------------********---------------------------------*/
}
};
@@ -128,7 +134,9 @@ if (aTaskFlag[1])
}
getField("TAS_SELFSERVICE_TRIGGER_UID").value = oTaskData.TAS_SELFSERVICE_TRIGGER_UID;
/*----------------------------------********---------------------------------*/
getField("TAS_SELFSERVICE_EXECUTION").value = oTaskData.TAS_SELFSERVICE_EXECUTION;
/*----------------------------------********---------------------------------*/
showTextpm();
break;