diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index c25cf6dbe..819f17c60 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -2434,13 +2434,13 @@ class wsBase
$result = array ();
try {
$oCriteria = new Criteria( 'workflow' );
- $del = DBAdapter::getStringDelimiter();
+ $del = DBAdapter::getStringDelimiter();
$oCriteria->addSelectColumn( AppDelegationPeer::DEL_INDEX );
$oCriteria->addSelectColumn( AppDelegationPeer::TAS_UID );
$oCriteria->addAsColumn( 'TAS_TITLE', 'C1.CON_VALUE' );
$oCriteria->addAlias( "C1", 'CONTENT' );
- $tasTitleConds = array ();
+ $tasTitleConds = array ();
$tasTitleConds[] = array (AppDelegationPeer::TAS_UID,'C1.CON_ID');
$tasTitleConds[] = array ('C1.CON_CATEGORY',$del . 'TAS_TITLE' . $del);
$tasTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del);
@@ -2464,8 +2464,7 @@ class wsBase
return $result;
} catch (Exception $e) {
- $result[] = array ('guid' => $e->getMessage(),'name' => $e->getMessage()
- );
+ $result[] = array ('guid' => $e->getMessage(),'name' => $e->getMessage(), 'delegate' => $e->getMessage() );
return $result;
}
diff --git a/workflow/engine/methods/services/pmos.wsdl b/workflow/engine/methods/services/pmos.wsdl
index cb1fc1ab7..33c88a67b 100755
--- a/workflow/engine/methods/services/pmos.wsdl
+++ b/workflow/engine/methods/services/pmos.wsdl
@@ -353,6 +353,7 @@
+
diff --git a/workflow/engine/methods/services/pmos2.wsdl b/workflow/engine/methods/services/pmos2.wsdl
index 8531027d5..49236304e 100755
--- a/workflow/engine/methods/services/pmos2.wsdl
+++ b/workflow/engine/methods/services/pmos2.wsdl
@@ -576,6 +576,7 @@
+
diff --git a/workflow/engine/methods/setup/webServicesAjax.php b/workflow/engine/methods/setup/webServicesAjax.php
index 41b888afd..d6cfd557e 100755
--- a/workflow/engine/methods/setup/webServicesAjax.php
+++ b/workflow/engine/methods/setup/webServicesAjax.php
@@ -1365,17 +1365,15 @@ try {
break;
case "TaskCase":
$sessionId = $frm["SESSION_ID"];
- $caseId = $frm["CASE_ID"];
+ $caseId = $frm["CASE_ID"];
- $params = array ('sessionId' => $sessionId,'caseId' => $caseId
- );
- $wsResponse = $client->__SoapCall( 'TaskCase', array ($params
- ) );
- $result = G::PMWSCompositeResponse( $wsResponse, 'taskCases' );
+ $params = array ('sessionId' => $sessionId,'caseId' => $caseId);
+ $wsResponse = $client->__SoapCall( 'TaskCase', array ($params) );
+
+ $result = G::PMWSCompositeResponse( $wsResponse, 'taskCases' );
$G_PUBLISH = new Publisher();
- $rows[] = array ('guid' => 'char','name' => 'char'
- );
+ $rows[] = array ('guid' => 'char','name' => 'char', 'delegate' => 'char' );
if (is_array( $result )) {
@@ -1388,6 +1386,9 @@ try {
if ($val->key == 'name') {
$name = $val->value;
}
+ if ($val->key == 'delegate') {
+ $delegate = $val->value;
+ }
}
} elseif (is_array( $item )) {
foreach ($item as $index => $val) {
@@ -1396,7 +1397,7 @@ try {
}
}
}
- if ($val->key == 'name') {
+ if (isset($val->key) && ($val->key == 'name')) {
$name = $val->value;
} else {
if (isset( $item->guid )) {
@@ -1405,28 +1406,29 @@ try {
if (isset( $item->name )) {
$name = $item->name;
}
+ if (isset( $item->delegate )) {
+ $delegate = $item->delegate;
+ }
}
- $rows[] = array ('guid' => $guid,'name' => $name
- );
+ $rows[] = array ('guid' => $guid, 'name' => $name, 'delegate' => $delegate);
}
global $_DBArray;
- $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+ $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
$_DBArray['taskCases'] = $rows;
- $_SESSION['_DBArray'] = $_DBArray;
+ $_SESSION['_DBArray'] = $_DBArray;
G::LoadClass( 'ArrayPeer' );
$c = new Criteria( 'dbarray' );
$c->setDBArrayTable( 'taskCases' );
$c->addAscendingOrderByColumn( 'name' );
$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/wsrTaskCase', $c );
- } elseif (is_object( $result ))
- {
+ } elseif (is_object( $result )) {
$_SESSION['WS_SESSION_ID'] = '';
- $fields['status_code'] = $result->status_code;
- $fields['message'] = $result->message;
- $fields['time_stamp'] = date( "Y-m-d H:i:s" );
+ $fields['status_code'] = $result->status_code;
+ $fields['message'] = $result->message;
+ $fields['time_stamp'] = date( "Y-m-d H:i:s" );
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
}
diff --git a/workflow/engine/xmlform/setup/wsrTaskCase.xml b/workflow/engine/xmlform/setup/wsrTaskCase.xml
index 2de1dd9ee..5a4f7ba86 100755
--- a/workflow/engine/xmlform/setup/wsrTaskCase.xml
+++ b/workflow/engine/xmlform/setup/wsrTaskCase.xml
@@ -3,10 +3,14 @@
Del Index
-Del Index
+
Task Title
-
+
+
+
+ Delegate Index
+
\ No newline at end of file