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

Merge branch '2.0' of git.colosa.net:processmaker into 2.0

Browse Source
This commit is contained in:
erik
2011-03-18 19:34:25 -04:00
parent 047eec3996 856e7987c0
commit 9e06fb61a8
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,6 +1,7 @@
.gitignore .gitignore
nbproject nbproject
workflow/engine/config/paths_installed.php workflow/engine/config/paths_installed.php
gulliver/thirdparty/html2ps_pdf/cache
*~ *~
workflow/engine/js/labels/ workflow/engine/js/labels/
workflow/public_html/files/ workflow/public_html/files/

6
workflow/engine/methods/cases/ajaxListener.php
View File

@@ -55,9 +55,9 @@ class Ajax
G::LoadClass('pmScript'); G::LoadClass('pmScript');
G::LoadClass('case'); G::LoadClass('case');
$PRO_UID = $_SESSION['PROCESS']; $PRO_UID = isset($_SESSION['PROCESS'])?$_SESSION['PROCESS']:'';
$TAS_UID = $_SESSION['TASK']; $TAS_UID = isset($_SESSION['TASK'])?$_SESSION['TASK']:'';
$APP_UID = $_SESSION['APPLICATION']; $APP_UID = isset($_SESSION['APPLICATION'])?$_SESSION['APPLICATION']:'';
$tree = Array(); $tree = Array();
$case = new Cases; $case = new Cases;
$step = new Step; $step = new Step;

7
workflow/engine/methods/cases/cases_Scheduler_Save.php
View File

@@ -231,20 +231,23 @@ try {
//Added by Qennix //Added by Qennix
//Update Start Time Event in BPMN //Update Start Time Event in BPMN
if (isset($_POST['form']['TAS_UID'])){
require_once 'classes/model/Event.php'; require_once 'classes/model/Event.php';
require_once 'classes/model/Task.php'; require_once 'classes/model/Task.php';
$oTask = new Task(); $oTask = new Task();
$oTask->load($_POST['form']['TAS_UID']); $oTask->load($_POST['form']['TAS_UID']);
echo '1';
$evn_uid = $oTask->getStartingEvent(); $evn_uid = $oTask->getStartingEvent();
echo '2'.$evn_uid;
$event = new Event(); $event = new Event();
$editEvent = array(); $editEvent = array();
$editEvent['EVN_UID'] = $evn_uid; $editEvent['EVN_UID'] = $evn_uid;
$editEvent['EVN_ACTION'] = $sch_uid; $editEvent['EVN_ACTION'] = $sch_uid;
$event->update($editEvent); $event->update($editEvent);
//End Adding //End Adding
}
G::header('location: cases_Scheduler_List?PRO_UID='.$_POST['form']['PRO_UID']); G::header('location: cases_Scheduler_List?PRO_UID='.$_POST['form']['PRO_UID']);

2
workflow/engine/templates/cases/open.js
View File

@@ -12,7 +12,7 @@ Ext.onReady(function(){
Ext.QuickTips.init(); Ext.QuickTips.init();
showCaseNavigatorPanel = function(steps, information, action) { showCaseNavigatorPanel = function(steps, information, action) {
if(steps==false&&action==false){ if(steps==false&&action==false&&typeof(treeToReviseTitle)!='undefined'){
var treeToRevise = new Ext.tree.TreePanel({ var treeToRevise = new Ext.tree.TreePanel({
title: treeToReviseTitle, title: treeToReviseTitle,
width: 250, width: 250,

4
workflow/engine/templates/setup/skinList.js
View File

@@ -224,8 +224,8 @@ Ext.onReady(function(){
pageSize: pageSize, pageSize: pageSize,
store: store, store: store,
displayInfo: true, displayInfo: true,
displayMsg: _('ID_GRID_PAGE_DISPLAYING_CALENDAR_MESSAGE') + '    ', displayMsg: _('ID_GRID_PAGE_DISPLAYING_SKIN_MESSAGE') + '    ',
emptyMsg: _('ID_GRID_PAGE_NO_CALENDAR_MESSAGE')//, emptyMsg: _('ID_GRID_PAGE_NO_SKIN_MESSAGE')//,
//items: ['-',_('ID_PAGE_SIZE')+':',comboPageSize] //items: ['-',_('ID_PAGE_SIZE')+':',comboPageSize]
}); });