diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/DashboardModule.php similarity index 99% rename from workflow/engine/controllers/dashboard.php rename to workflow/engine/controllers/DashboardModule.php index 84c0101fc..c6ee4e6ca 100644 --- a/workflow/engine/controllers/dashboard.php +++ b/workflow/engine/controllers/DashboardModule.php @@ -7,7 +7,7 @@ * @access public */ -class Dashboard extends Controller +class DashboardModule extends Controller { // Class properties diff --git a/workflow/engine/menus/setup.php b/workflow/engine/menus/setup.php index e057714f4..50caffa9a 100644 --- a/workflow/engine/menus/setup.php +++ b/workflow/engine/menus/setup.php @@ -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' ); diff --git a/workflow/engine/templates/dashboard/index.js b/workflow/engine/templates/dashboard/index.js index 132cdd557..37b2ee022 100644 --- a/workflow/engine/templates/dashboard/index.js +++ b/workflow/engine/templates/dashboard/index.js @@ -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); } } diff --git a/workflow/engine/templates/dashboard/load.php b/workflow/engine/templates/dashboard/load.php index 11cb8a205..125367067 100644 --- a/workflow/engine/templates/dashboard/load.php +++ b/workflow/engine/templates/dashboard/load.php @@ -8,7 +8,7 @@ } -