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

Merge pull request #1884 from marcoAntonioNina/BUG-12339

Browse Source 
Bug 12339BUG-12339 Al crear un report table el sistema direcciona a una... SOLVED
This commit is contained in:
julceslauhub
2013-07-11 11:40:53 -07:00
parent 1db1aff220 22d17c5064
commit d2dbae3ed4
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/controllers/pmTables.php
View File

@@ -36,6 +36,7 @@ class pmTables extends Controller
$this->setView( 'pmTables/list' );
//assigning js variables
$this->setJSVar( 'flagProcessmap', (isset($_REQUEST['flagProcessmap'])) ? $_REQUEST['flagProcessmap'] : 0);
$this->setJSVar( 'FORMATS', $c->getFormats() );
$this->setJSVar( 'CONFIG', $Config );
$this->setJSVar( 'PRO_UID', isset( $_GET['PRO_UID'] ) ? $_GET['PRO_UID'] : false );
@@ -102,6 +103,7 @@ class pmTables extends Controller
$this->includeExtJS( 'pmTables/' . $jsFile );
$this->setJSVar( 'flagProcessmap', (isset($_REQUEST['flagProcessmap'])) ? $_REQUEST['flagProcessmap'] : 0);
$this->setJSVar( 'ADD_TAB_UID', $addTabUid );
$this->setJSVar( 'PRO_UID', isset( $_GET['PRO_UID'] ) ? $_GET['PRO_UID'] : false );
$this->setJSVar( 'TABLE', $table );

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

@@ -157,7 +157,7 @@ var processmap=function(){
r.make();
}.extend(this),
reportTables:function(){
var url = "../pmTables?PRO_UID=" + this.options.uid;
var url = "../pmTables?PRO_UID=" + this.options.uid+"&flagProcessmap=1";
var isIE = (navigator.userAgent.toLowerCase().indexOf("msie") != -1)? 1 : 0;
if (isIE == 1) {

6
workflow/engine/templates/pmTables/editReport.js
View File

@@ -936,8 +936,8 @@ Ext.onReady(function(){
}, {
text:_("ID_CANCEL"),
handler: function() {
proParam = PRO_UID !== false ? '?PRO_UID='+PRO_UID : '';
location.href = '../pmTables' + proParam; //history.back();
proParam = (typeof('flagProcessmap') != 'undefined' && flagProcessmap == 1) ? (PRO_UID !== false ? '?flagProcessmap=1&PRO_UID='+PRO_UID : '') : '';
location.href = '../pmTables' + proParam; //history.back();
}
}]
});
@@ -1087,7 +1087,7 @@ function createReportTable()
Ext.MessageBox.hide();
if (result.success) {
proParam = PRO_UID !== false ? '?PRO_UID='+PRO_UID : '';
proParam = (typeof('flagProcessmap') != 'undefined' && flagProcessmap == 1) ? (PRO_UID !== false ? '?flagProcessmap=1&PRO_UID='+PRO_UID : '') : '';
location.href = '../pmTables' + proParam; //history.back();
} else {
PMExt.error(_('ID_ERROR'), result.type +': '+result.msg);

12
workflow/engine/templates/pmTables/list.js
View File

@@ -413,11 +413,13 @@ capitalize = function(s){
DoNothing = function(){};
//Load New PM Table Forms
NewReportTable = function(){
if(PRO_UID !== false)
location.href = 'pmTables/edit?PRO_UID='+PRO_UID+'&tableType=report';
else
location.href = 'pmTables/edit?tableType=report';
NewReportTable = function() {
var flagProcessmap = (typeof('flagProcessmap') != 'undefined') ? flagProcessmap : 0;
if(PRO_UID !== false) {
location.href = 'pmTables/edit?PRO_UID='+PRO_UID+'&tableType=report&flagProcessmap='+flagProcessmap;
} else {
location.href = 'pmTables/edit?tableType=report&flagProcessmap='+flagProcessmap;
}
};
NewReportTableOld = function(){