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

Merged in HOR-3670-MN7 (pull request #5981)

Browse Source 
HOR-3670-MN7

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Marco Antonio Nina Mena
2017-08-17 21:09:29 +00:00
committed by Julio Cesar Laura Avendaño
parent c9f0049dd0 d916b5c4f1
commit ef93785bba
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/controllers/dashboard.php → workflow/engine/controllers/DashboardModule.php
View File

@@ -7,7 +7,7 @@
* @access public
*/
class Dashboard extends Controller
class DashboardModule extends Controller
{
// Class properties

2
workflow/engine/menus/setup.php
View File

@@ -120,7 +120,7 @@ if ($RBAC->userCanAccess('PM_SETUP') === 1) {
}
if ($RBAC->userCanAccess('PM_SETUP_DASHBOARDS') === 1) {
$G_TMP_MENU->AddIdRawOption(
'DASHBOARD', '../dashboard/dashletsList',
'DASHBOARD', '../DashboardModule/dashletsList',
ucfirst(G::LoadTranslation('ID_DASHBOARD')),
'', '', 'settings'
);

12
workflow/engine/templates/dashboard/index.js
View File

@@ -132,7 +132,7 @@ Ext.onReady(function(){
positionCol2: Ext.encode(orderNow[2]),
columns: 3
},
url: 'dashboard/saveOrderDashlet',
url: 'DashboardModule/saveOrderDashlet',
success: function (res) {
var data = Ext.decode(res.responseText);
if (data.success) {
@@ -186,7 +186,7 @@ Ext.onReady(function(){
positionCol2: Ext.encode(orderNow[2]),
columns: 2
},
url: 'dashboard/saveOrderDashlet',
url: 'DashboardModule/saveOrderDashlet',
success: function (res) {
var data = Ext.decode(res.responseText);
if (data.success) {
@@ -223,7 +223,7 @@ Ext.onReady(function(){
positionCol2: Ext.encode(orderNow[2]),
columns: 1
},
url: 'dashboard/saveOrderDashlet',
url: 'DashboardModule/saveOrderDashlet',
success: function (res) {
var data = Ext.decode(res.responseText);
if (data.success) {
@@ -292,7 +292,7 @@ Ext.onReady(function(){
positionCol2: Ext.encode(orderNow[2]),
columns: colum
},
url: "dashboard/saveOrderDashlet",
url: "DashboardModule/saveOrderDashlet",
success: function (res) {
var data = Ext.decode(res.responseText);
if (data.success) {
@@ -327,10 +327,10 @@ Ext.onReady(function(){
'resize': function(p, w, h) {
var template = new Ext.XTemplate(dashletsInstances[p.indicei][p.indiced].DAS_XTEMPLATE).apply({
id: p.dasInsUid,
page: 'dashboard/renderDashletInstance',
page: 'DashboardModule/renderDashletInstance',
width: w - 12,
random: Math.floor(Math.random() * 1000000)
})
});
p.update(template);
}
}

2
workflow/engine/templates/dashboard/load.php
View File

@@ -8,7 +8,7 @@
}
</style>
<body onresize="autoResizeScreen()" onload="autoResizeScreen()">
<iframe name="casesFrame" id="casesFrame" src ="../dashboard" width="99%" height="768" frameborder="0">
<iframe name="casesFrame" id="casesFrame" src ="../DashboardModule" width="99%" height="768" frameborder="0">
<p>Your browser does not support iframes.</p>
</iframe>
</body>