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

HOR-4505: update with 3.2.3

Browse Source
This commit is contained in:
Paula Quispe
2018-05-04 12:11:01 -04:00
parent 6e704582ee d2d5b9454e
commit 00bb3bf43d
28 changed files with 307 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/bin/tasks/cliFlushCache.php
View File

@@ -56,7 +56,7 @@ function run_flush_cache($args, $opts)
flush_cache($workspaces[0]);
} else {
foreach ($workspaces as $workspace) {
passthru("./processmaker flush-cache " . $workspace->name);
passthru(PHP_BINARY . " processmaker flush-cache " . $workspace->name);
}
}
}

14
workflow/engine/bin/tasks/cliWorkspaces.php
View File

@@ -379,7 +379,7 @@ function run_workspace_upgrade($args, $opts)
} else {
$workspaces = get_workspaces_from_args($args);
foreach ($workspaces as $workspace) {
passthru('./processmaker upgrade ' . $parameters . ' ' . $workspace->name);
passthru(PHP_BINARY . ' processmaker upgrade ' . $parameters . ' ' . $workspace->name);
}
}
}
@@ -435,7 +435,7 @@ function run_upgrade_content($args, $opts)
} else {
$workspaces = get_workspaces_from_args($args);
foreach ($workspaces as $workspace) {
passthru('./processmaker upgrade-content ' . $workspace->name);
passthru(PHP_BINARY . ' processmaker upgrade-content ' . $workspace->name);
}
}
}
@@ -491,7 +491,7 @@ function run_translation_upgrade($args, $opts)
} else {
$workspaces = get_workspaces_from_args($args);
foreach ($workspaces as $workspace) {
passthru('./processmaker translation-repair ' . $noXml . $noMafe . ' ' . $workspace->name);
passthru(PHP_BINARY . ' processmaker translation-repair ' . $noXml . $noMafe . ' ' . $workspace->name);
}
}
}
@@ -588,7 +588,7 @@ function run_database_upgrade($args, $opts)
} else {
$workspaces = get_workspaces_from_args($args);
foreach ($workspaces as $workspace) {
passthru('./processmaker database-upgrade ' . $workspace->name);
passthru(PHP_BINARY . ' processmaker database-upgrade ' . $workspace->name);
}
}
}
@@ -999,7 +999,7 @@ function run_check_workspace_disabled_code($args, $opts)
} else {
$workspaces = get_workspaces_from_args($args);
foreach ($workspaces as $workspace) {
passthru('./processmaker check-workspace-disabled-code ' . $workspace->name);
passthru(PHP_BINARY . ' processmaker check-workspace-disabled-code ' . $workspace->name);
}
}
}
@@ -1138,7 +1138,7 @@ function run_migrate_content($args, $opts)
} else {
$workspaces = get_workspaces_from_args($args);
foreach ($workspaces as $workspace) {
passthru('./processmaker migrate-content ' . $lang . ' ' . $workspace->name);
passthru(PHP_BINARY . ' processmaker migrate-content ' . $lang . ' ' . $workspace->name);
}
}
}
@@ -1216,7 +1216,7 @@ function run_migrate_plugin($args, $opts)
CLI::logging("> Migrating and populating data...\n");
$start = microtime(true);
foreach ($workspaces as $workspace) {
passthru('./processmaker migrate-plugins-singleton-information ' . $workspace->name);
passthru(PHP_BINARY . ' processmaker migrate-plugins-singleton-information ' . $workspace->name);
}
$stop = microtime(true);
CLI::logging("<*> Migrating and populating data Singleton took " . ($stop - $start) . " seconds.\n");

4
workflow/engine/classes/Applications.php
View File

@@ -112,8 +112,8 @@ class Applications
default: //All status
//When the status is TO_DO, we will get all the open threads
$sqlData .= " AND (APP_DELEGATION.DEL_THREAD_STATUS = 'OPEN' ";
//When the status is COMPLETED, we will get the last task that with completed the case
$sqlData .= " OR (APP_DELEGATION.DEL_THREAD_STATUS = 'CLOSED' AND APP_DELEGATION.DEL_LAST_INDEX = 1 AND APPLICATION.APP_STATUS_ID = 3)) ";
//When the status is COMPLETED or CANCELLED, we will get the last task that with completed/cancelled the case
$sqlData .= " OR (APP_DELEGATION.DEL_THREAD_STATUS = 'CLOSED' AND APP_DELEGATION.DEL_LAST_INDEX = 1 AND APPLICATION.APP_STATUS_ID IN (3,4))) ";
break;
}

2
workflow/engine/classes/WorkspaceTools.php
View File

@@ -2024,7 +2024,7 @@ class WorkspaceTools
CLI::logging("<*> Migrating an populating indexing for APP_CACHE_VIEW process took " . ($stop - $start) . " seconds.\n");
//Updating generated class files for PM Tables
passthru('./processmaker regenerate-pmtable-classes ' . $workspace->name);
passthru(PHP_BINARY . ' processmaker regenerate-pmtable-classes ' . $workspace->name);
mysql_close($link);
}

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

@@ -5689,7 +5689,6 @@
<index-column name="STATUS"/>
</index>
</table>
<table name="NOTIFICATION_QUEUE" idMethod="native">
<column name="NOT_UID" type="VARCHAR" size="32" required="true" primaryKey="true"/>
<column name="DEV_TYPE" type="VARCHAR" size="50" required="true"/>

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

@@ -61529,7 +61529,7 @@ INSERT INTO CONFIGURATION (CFG_UID,OBJ_UID,CFG_VALUE,PRO_UID,USR_UID,APP_UID) VA
('AUDIT_LOG','log','s:5:"false";','','',''),
('ENTERPRISE_SETTING_ENCRYPT','','a:2:{s:7:"current";s:6:"sha256";s:8:"previous";s:3:"md5";}','','',''),
('ENVIRONMENT_SETTINGS','','a:1:{s:18:"directoryStructure";i:2;}','','',''),
('MIGRATED_CONTENT','content','a:12:{i:0;s:7:"Groupwf";i:1;s:7:"Process";i:2;s:10:"Department";i:3;s:4:"Task";i:4;s:13:"InputDocument";i:5;s:11:"Application";i:6;s:11:"AppDocument";i:7;s:8:"Dynaform";i:8;s:14:"OutputDocument";i:9;s:11:"ReportTable";i:10;s:8:"Triggers";i:11;s:41:"\ProcessMaker\BusinessModel\WebEntryEvent";}','','',''),
('MIGRATED_CONTENT','content','a:12:{i:0;s:7:"Groupwf";i:1;s:7:"Process";i:2;s:10:"Department";i:3;s:4:"Task";i:4;s:13:"InputDocument";i:5;s:11:"Application";i:6;s:11:"AppDocument";i:7;s:8:"Dynaform";i:8;s:14:"OutputDocument";i:9;s:11:"ReportTable";i:10;s:8:"Triggers";i:11;s:41:"\\ProcessMaker\\BusinessModel\\WebEntryEvent";}','','',''),
('MIGRATED_LIST','list','true','list','list','list'),
('MIGRATED_LIST_UNASSIGNED','list','true','list','list','list'),
('SKIN_CRON','','s:10:"neoclassic";','','','');

1
workflow/engine/methods/mails/emailsAjax.php
View File

@@ -82,6 +82,7 @@ switch ($req) {
}
//Date from and to
if (!empty($dateFrom) && !empty($dateTo)) {
$dateTo = $dateTo . " 23:59:59";
$criteria->add($criteria->getNewCriterion(AppMessagePeer::APP_MSG_DATE, $dateFrom, Criteria::GREATER_EQUAL)->addAnd($criteria->getNewCriterion(AppMessagePeer::APP_MSG_DATE, $dateTo, Criteria::LESS_EQUAL)));
} else {
if (!empty($dateFrom)) {

2
workflow/engine/skinEngine/base/css/sprite.css
View File

@@ -28,7 +28,7 @@ Sprite modificado de http://ajaxbestiary.com/Labs/SilkSprite/
.panel_headerBar___processmaker{background:url("/images/ext/gray/toolbar/bg.gif") #F0F0F0 !important}
.button_menu_ext{padding-left:20px !important;height:18px !important;}
.button_menu_ext{height:18px !important;}
.button_large_ext{padding-left:20px !important;height:32px !important;}
.button_toolbar{padding-left:18px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 2px 1px 3px;line-height:25px}
.ss_accept{background-position:0 0 !important}

1
workflow/engine/skinEngine/neoclassic/css/sprite.css
View File

@@ -220,7 +220,6 @@ Sprite modificado de http://ajaxbestiary.com/Labs/SilkSprite/
background: url("/skins/neoclassic/images/ext/gray/toolbar/bg.gif") #f0f0f0 !important;
}
.button_menu_ext {
padding-left: 20px !important;
height: 18px !important;
}
.button_large_ext {

2
workflow/engine/skinEngine/uxmodern/css/sprite.css
View File

@@ -28,7 +28,7 @@ Sprite modificado de http://ajaxbestiary.com/Labs/SilkSprite/
.panel_headerBar___processmaker{background:url("/images/ext/gray/toolbar/bg.gif") #F0F0F0 !important}
.button_menu_ext{padding-left:20px !important;height:18px !important;}
.button_menu_ext{height:18px !important;}
.button_large_ext{padding-left:20px !important;height:32px !important;}
.button_toolbar{padding-left:18px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 2px 1px 3px;line-height:25px}
.ss_accept{background-position:0 0 !important}

2
workflow/engine/skinEngine/uxs/css/sprite.css
View File

@@ -28,7 +28,7 @@ Sprite modificado de http://ajaxbestiary.com/Labs/SilkSprite/
.panel_headerBar___processmaker{background:url("/images/ext/gray/toolbar/bg.gif") #F0F0F0 !important}
.button_menu_ext{padding-left:20px !important;height:18px !important;}
.button_menu_ext{height:18px !important;}
.button_large_ext{padding-left:20px !important;height:32px !important;}
.button_toolbar{padding-left:18px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 2px 1px 3px;line-height:25px}
.ss_accept{background-position:0 0 !important}

7
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -1106,11 +1106,11 @@ class Cases
* @param string $applicationUid Unique id of Case
* @param string $userUid Unique id of User
* @param string $delIndex
* @param string $bExecuteTriggersBeforeAssignment
* @param boolean $executeTriggersBeforeAssignment
*
* return array Return an array with Task Case
*/
public function updateRouteCase($applicationUid, $userUid, $delIndex)
public function updateRouteCase($applicationUid, $userUid, $delIndex, $executeTriggersBeforeAssignment)
{
try {
if (!$delIndex) {
@@ -1124,8 +1124,7 @@ class Cases
}
$ws = new WsBase();
$fields = $ws->derivateCase($userUid, $applicationUid, $delIndex,
$bExecuteTriggersBeforeAssignment = false);
$fields = $ws->derivateCase($userUid, $applicationUid, $delIndex, $executeTriggersBeforeAssignment);
$array = json_decode(json_encode($fields), true);
if ($array ["status_code"] != 0) {
throw (new Exception($array ["message"]));

17
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -547,12 +547,12 @@ class Light
* @param string $applicationUid Unique id of Case
* @param string $userUid Unique id of User
* @param string $delIndex
* @param array $tasks
* @param string $bExecuteTriggersBeforeAssignment
* @param string $tasks
* @param boolean $executeTriggersBeforeAssignment
*
* return array Return an array with Task Case
*/
public function updateRouteCase($applicationUid, $userUid, $delIndex, $tasks)
public function updateRouteCase($applicationUid, $userUid, $delIndex, $tasks, $executeTriggersBeforeAssignment)
{
try {
if (!$delIndex) {
@@ -560,8 +560,15 @@ class Light
}
$ws = new \WsBase();
$fields = $ws->derivateCase($userUid, $applicationUid, $delIndex, $bExecuteTriggersBeforeAssignment = false,
$tasks);
$fields = $ws->derivateCase(
$userUid,
$applicationUid,
$delIndex,
$executeTriggersBeforeAssignment,
$tasks
);
$array = json_decode(json_encode($fields), true);
$array['message'] = trim(strip_tags($array['message']));
if ($array ["status_code"] != 0) {

2
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -1311,7 +1311,7 @@ class BpmnWorkflow extends Project\Bpmn
$data["PRO_STATUS"] = $projectData['pro_status'];
}
if (isset($projectData['prjCreateUser'])){
if (!empty($projectData['prjCreateUser'])) {
$data["PRO_CREATE_USER"] = $projectData['prjCreateUser'];
}

5
workflow/engine/src/ProcessMaker/Services/Api/Cases.php
View File

@@ -860,18 +860,19 @@ class Cases extends Api
*
* @param string $app_uid {@min 32}{@max 32}
* @param string $del_index {@from body}
* @param boolean $executeTriggersBeforeAssignment {@from body}
*
* @throws RestException
*
* @access protected
* @class AccessControl {@permission PM_CASES}
*/
public function doPutRouteCase($app_uid, $del_index = null)
public function doPutRouteCase($app_uid, $del_index = null, $executeTriggersBeforeAssignment = false)
{
try {
$userUid = $this->getUserId();
$cases = new BmCases();
$cases->updateRouteCase($app_uid, $userUid, $del_index);
$cases->updateRouteCase($app_uid, $userUid, $del_index, $executeTriggersBeforeAssignment);
} catch (Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
}

5
workflow/engine/src/ProcessMaker/Services/Api/Light.php
View File

@@ -1196,6 +1196,7 @@ class Light extends Api
* @param string $app_uid {@min 32}{@max 32}
* @param int $del_index {@from body}
* @param array $tasks {@from body}
* @param boolean $executeTriggersBeforeAssignment {@from body}
*
* @return array
* @throws RestException
@@ -1203,11 +1204,11 @@ class Light extends Api
* @access protected
* @class AccessControl {@permission PM_CASES}
*/
public function doPutRouteCase($app_uid, $del_index = null, $tasks = array())
public function doPutRouteCase($app_uid, $del_index = null, $tasks = array(), $executeTriggersBeforeAssignment = false)
{
try {
$oMobile = new BusinessModelLight();
$response = $oMobile->updateRouteCase($app_uid, $this->getUserId(), $del_index, $tasks);
$response = $oMobile->updateRouteCase($app_uid, $this->getUserId(), $del_index, $tasks, $executeTriggersBeforeAssignment);
} catch (Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
}

49
workflow/engine/src/ProcessMaker/Services/Api/Project.php
View File

@@ -32,6 +32,8 @@ class Project extends Api
];
/**
* Get all Projects.
*
* @url GET
*/
public function doGetProjects()
@@ -50,8 +52,13 @@ class Project extends Api
}
/**
* Get a Project by identifier.
*
* @url GET /:prj_uid
* @param string $prj_uid {@min 32}{@max 32}
*
* @access protected
* @class AccessControl {@permission PM_FACTORY, PM_CASES}
*/
public function doGetProject($prj_uid)
{
@@ -68,7 +75,7 @@ class Project extends Api
}
/**
* Post Project
* Create Project from structure.
*
* @param string $prj_name
* @param array $request_data
@@ -89,6 +96,8 @@ class Project extends Api
}
/**
* Update Project from structure.
*
* @url PUT /:prj_uid
* @param string $prj_uid {@min 32}{@max 32}
*/
@@ -113,6 +122,8 @@ class Project extends Api
}
/**
* Remove Project BPMN.
*
* @param string $prj_uid {@min 1}{@max 32}
* @url DELETE /:prj_uid
* @throws Exception
@@ -135,11 +146,13 @@ class Project extends Api
* Bulk actions
*
* @url POST /bulk
* @access protected
* @class AccessControl {@permission PM_FACTORY}
*
* @param array $request_data
* @return array $response
* @throws Exception
*
* @access protected
* @class AccessControl {@permission PM_FACTORY}
*/
public function bulk($request_data)
{
@@ -152,6 +165,8 @@ class Project extends Api
}
/**
* Get a list of exportable objects.
*
* @url GET /:prj_uid/export/listObjects
* @param string $prj_uid {@min 32}{@max 32}
* @return mixed|string
@@ -169,6 +184,8 @@ class Project extends Api
}
/**
* Export Project (Promotion Manager).
*
* @url GET /:prj_uid/export-granular
* @param string $prj_uid {@min 32}{@max 32}
* @param string $objects
@@ -191,6 +208,8 @@ class Project extends Api
}
/**
* Export Project (Normal).
*
* @url GET /:prj_uid/export
* @param string $prj_uid {@min 32}{@max 32}
*/
@@ -217,6 +236,8 @@ class Project extends Api
}
/**
* Import Project.
*
* @url POST /import
* @param array $request_data
* @status 201
@@ -245,6 +266,8 @@ class Project extends Api
}
/**
* Save an existing Project as another Project.
*
* @url POST /save-as
* @param string $prj_uid {@from body}
* @param string $prj_name {@from body}
@@ -258,6 +281,8 @@ class Project extends Api
}
/**
* Get the Process related to a Project.
*
* @url GET /:prj_uid/process
* @param string $prj_uid {@min 32}{@max 32}
*/
@@ -278,6 +303,8 @@ class Project extends Api
}
/**
* Update the Process related to a Project.
*
* @url PUT /:prj_uid/process
* @param string $prj_uid {@min 32}{@max 32}
* @param array $request_data
@@ -297,6 +324,8 @@ class Project extends Api
}
/**
* Generate a BPMN Project.
*
* @url POST /generate-bpmn
* @param array $request_data
* @status 201
@@ -333,6 +362,8 @@ class Project extends Api
}
/**
* Get the Dynaforms list of a Project.
*
* @url GET /:prj_uid/dynaforms
* @param string $prj_uid {@min 32}{@max 32}
*/
@@ -352,6 +383,8 @@ class Project extends Api
}
/**
* Get the Input Documents list of a Project.
*
* @url GET /:prj_uid/input-documents
* @param string $prj_uid {@min 32}{@max 32}
*/
@@ -371,6 +404,8 @@ class Project extends Api
}
/**
* Get the Variables list of a Project.
*
* @url GET /:prj_uid/variables
* @param string $prj_uid {@min 32}{@max 32}
*/
@@ -390,6 +425,8 @@ class Project extends Api
}
/**
* Get the list of the Grid Variables of a Project.
*
* @url GET /:prj_uid/grid/variables
* @url GET /:prj_uid/grid/:grid_uid/variables
* @param string $prj_uid {@min 32}{@max 32}
@@ -411,6 +448,8 @@ class Project extends Api
}
/**
* Get the PM Functions definition for the Triggers wizard module
*
* @url GET /:prj_uid/trigger-wizards
* @param string $prj_uid {@min 32}{@max 32}
*/
@@ -430,6 +469,8 @@ class Project extends Api
}
/**
* Update route order of a Process related to a Project.
*
* @url PUT /:prj_uid/update-route-order
* @param string $prj_uid {@min 32}{@max 32}
*/
@@ -445,6 +486,8 @@ class Project extends Api
}
/**
* Update route order of a Project.
*
* @url PUT /:prj_uid/update-route-order-from-project
* @param string $prj_uid {@min 32}{@max 32}
*/

22
workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
View File

@@ -342,7 +342,7 @@ class Server implements iAuthenticate
$pmAccessToken = new \PmoauthUserAccessTokens();
$session = $pmAccessToken->getSessionData($token['ACCESS_TOKEN']);
if ($session !== false && array_key_exists($session->getSessionName(), $_COOKIE)) {
if ($session !== false && array_key_exists($session->getSessionName(), $_COOKIE)) {
// increase the timeout for local php session cookie
$config = \Bootstrap::getSystemConfiguration();
if (isset($config['session.gc_maxlifetime'])) {
@@ -356,21 +356,21 @@ class Server implements iAuthenticate
setcookie($session->getSessionName(), $_COOKIE[$session->getSessionName()], time() + $lifetime, "/", null, false, true);
}
}
//Set User Time Zone
$user = \UsersPeer::retrieveByPK(self::$userId);
//Set User Time Zone
$user = \UsersPeer::retrieveByPK(self::$userId);
if (!is_null($user)) {
$userTimeZone = $user->getUsrTimeZone();
if (!is_null($user)) {
$userTimeZone = $user->getUsrTimeZone();
if (trim($userTimeZone) == '') {
$arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));
if (trim($userTimeZone) == '') {
$arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));
$userTimeZone = $arraySystemConfiguration['time_zone'];
}
$_SESSION['USR_TIME_ZONE'] = $userTimeZone;
$userTimeZone = $arraySystemConfiguration['time_zone'];
}
$_SESSION['USR_TIME_ZONE'] = $userTimeZone;
}
return $allowed;

186
workflow/engine/templates/cases/caseMessageHistory.js
View File

@@ -2,14 +2,12 @@
* @author: Douglas Medrano
* May 03, 2011
*/
//var windowMessage;
windowMessage = new Object();
var windowMessage = new Object();
function onResizeIframe(idIframe){
window.parent.tabIframeWidthFix2(idIframe);
}
function windowPreviewMessage(rowSelected) {
windowMessage = new Ext.Window({
title: '',
width: 600,
@@ -138,12 +136,13 @@
function ajaxPostRequest(url, callback_function, id){
var d = new Date();
var time = d.getTime();
function ajaxPostRequest (url, callback_function, id) {
var d = new Date(),
time = d.getTime(),
return_xml=false,
http_request = false;
url= url + '&nocachetime='+time;
var return_xml=false;
var http_request = false;
if (window.XMLHttpRequest){ // Mozilla, Safari,...
http_request = new XMLHttpRequest();
@@ -169,21 +168,19 @@
return false;
}
http_request.onreadystatechange = function(){
if (http_request.readyState == 4){
if (http_request.status == 200){
if (return_xml){
eval(callback_function + '(http_request.responseXML)');
http_request.onreadystatechange = function () {
if (http_request.readyState === 4) {
if (http_request.status === 200) {
if (return_xml) {
eval(callback_function + '(http_request.responseXML)');
} else {
eval(callback_function + '(http_request.responseText, \'' + id + '\')');
}
else{
eval(callback_function + '(http_request.responseText, \''+id+'\')');
}
}
else{
alert('Error found on request:(Code: ' + http_request.status + ')');
} else {
alert('Error found on request:(Code: ' + http_request.status + ')');
}
}
}
};
http_request.open('GET', url, true);
http_request.send(null);
}
@@ -302,82 +299,77 @@ var ActionTabFrameGlobal = '';
}
//!!historyGridList|changeLog
function caseMessageHistory_RSP(response,id){
function caseMessageHistory_RSP (response, id) {
messageHistoryGridListMask.hide();
if(response==""){
Ext.Msg.show({
title:'',
msg: _('ID_MAIL_SENT_SUCCESSFULLY'),
buttons: Ext.Msg.INFO,
fn: function(){},
animEl: 'elId',
icon: Ext.MessageBox.INFO,
buttons: Ext.MessageBox.OK
});
Ext.destroy(Ext.getCmp('processesGrid'));
messageHistoryGridList();
if (response === "") {
Ext.Msg.show({
title: '',
msg: _('ID_MAIL_SENT_SUCCESSFULLY'),
buttons: Ext.Msg.INFO,
animEl: 'elId',
icon: Ext.MessageBox.INFO,
buttons: Ext.MessageBox.OK
});
Ext.destroy(Ext.getCmp('processesGrid'));
store.destroy();
messageHistoryGridList();
}
else{
alert(response);
else {
alert(response);
}
}
}
function messageHistoryGridList () {
var expander,
startDateRender,
escapeHtml,
actionRenderingTranslation,
processesGrid,
viewport;
function messageHistoryGridList(){
store = new Ext.data.GroupingStore({
remoteSort: true,
proxy : new Ext.data.HttpProxy
(
{
url: 'caseMessageHistory_Ajax.php?actionAjax=messageHistoryGridList_JXP'
}
),
remoteSort: true,
proxy: new Ext.data.HttpProxy({
url: 'caseMessageHistory_Ajax.php?actionAjax=messageHistoryGridList_JXP'
}),
reader: new Ext.data.JsonReader({
totalProperty: 'totalCount',
root: 'data',
fields: [
{name: 'ID_MESSAGE'},
{name: 'APP_MSG_TYPE'},
{name: 'APP_MSG_DATE'},
{name: 'APP_MSG_SUBJECT'},
{name: 'APP_MSG_FROM'},
{name: 'APP_MSG_TO'},
{name: 'APP_MSG_STATUS'},
{name: 'APP_MSG_BODY'},
{name: 'MSGS_HISTORY'}
reader : new Ext.data.JsonReader
(
{
totalProperty: 'totalCount',
root: 'data',
fields :
[
{name : 'ID_MESSAGE'},
{name : 'APP_MSG_TYPE'},
{name : 'APP_MSG_DATE'},
{name : 'APP_MSG_SUBJECT'},
{name : 'APP_MSG_FROM'},
{name : 'APP_MSG_TO'},
{name : 'APP_MSG_STATUS'},
{name : 'APP_MSG_BODY'},
{name : 'MSGS_HISTORY'}
]
}
)
]
})
});
var expander = new Ext.ux.grid.RowExpander({
expander = new Ext.ux.grid.RowExpander({
tpl : new Ext.Template(
'<p><b>'+TRANSLATIONS.ID_PRO_DESCRIPTION+':</b> {PRO_DESCRIPTION}</p><br>'
)
});
startDateRender = function(v){
startDateRender = function (v) {
var dateString = "-";
if(v!="-"){
if (v !== "-") {
dateString = _DF(v,"m/d/Y H:i:s");
}
return dateString;
}
escapeHtml = function(v){
};
escapeHtml = function (v) {
var pre = document.createElement('pre');
var text = document.createTextNode( v );
pre.appendChild(text);
return pre.innerHTML;
}
};
actionRenderingTranslation = function(v){
var actionTranslate = "";
@@ -399,13 +391,11 @@ var ActionTabFrameGlobal = '';
return actionTranslate;
};
var processesGrid = new Ext.grid.GridPanel({
processesGrid = new Ext.grid.GridPanel({
region: 'center',
layout: 'fit',
layout: 'column',
id: 'processesGrid',
height:500,
//autoWidth : true,
width:'',
title : '',
stateful : true,
@@ -413,11 +403,9 @@ var ActionTabFrameGlobal = '';
enableColumnResize: true,
enableHdMenu: true,
frame:false,
//plugins: expander,
// cls : 'grid_with_checkbox',
columnLines: true,
viewConfig: {
forceFit:true,
forceFit: true,
emptyText: (_('ID_NO_RECORDS_FOUND'))
},
cm: new Ext.grid.ColumnModel({
@@ -426,7 +414,6 @@ var ActionTabFrameGlobal = '';
sortable: true
},
columns: [
//expander,
{id:'ID_MESSAGE', dataIndex: 'ID_MESSAGE', hidden:true, hideable:false},
{header: _("ID_TYPE"), dataIndex: 'APP_MSG_TYPE', width: 70},
{header: _("ID_DATE_LABEL"), dataIndex: 'APP_MSG_DATE', width: 60, renderer: startDateRender},
@@ -437,7 +424,6 @@ var ActionTabFrameGlobal = '';
{header: _("ID_APP_MSG_BODY"), dataIndex: 'APP_MSG_BODY', width: 50,hidden:true},
{id:'MSGS_HISTORY', dataIndex: 'MSGS_HISTORY', hidden:true, hideable:false},
{
// header: _("ID_RESEND"),
xtype: 'actioncolumn',
width: 60,
items: [
@@ -506,33 +492,15 @@ var ActionTabFrameGlobal = '';
processesGrid.store.load({params: {"actionAjax":"messageHistoryGridList_JXP"}});
processesGrid.store.on(
'load',
function()
{
//window.parent.resize_iframe();
},
this,
{
single: true
}
);
processesGrid.on('contextmenu', function (evt) {
evt.preventDefault();
evt.preventDefault();
}, this);
function emptyReturn(){
}
var viewport = new Ext.Viewport({
layout: 'border',
autoScroll: true,
items: [
processesGrid
]
});
}
//!historyGridList|
viewport = new Ext.Viewport({
layout: 'fit',
autoScroll: true,
items: [
processesGrid
]
});
}