From d519901f50cb0133787d6d2e00a319eab56539d4 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 5 Jan 2021 16:27:54 +0800 Subject: [PATCH] sync --- MTrackWeb/templates/images/MTrackWeb/MTrackWeb.Layout.js | 2 +- .../templates/images/MTrackWeb/MTrackWeb.Tab.TicketView.js | 2 +- MTrackWeb/templates/images/js/mtrack.js | 2 +- MTrackWeb/templates/images/js/mtrack.project.js | 4 ++-- MTrackWeb/templates/images/js/mtrack2.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MTrackWeb/templates/images/MTrackWeb/MTrackWeb.Layout.js b/MTrackWeb/templates/images/MTrackWeb/MTrackWeb.Layout.js index e2a650a1..1040e9c6 100644 --- a/MTrackWeb/templates/images/MTrackWeb/MTrackWeb.Layout.js +++ b/MTrackWeb/templates/images/MTrackWeb/MTrackWeb.Layout.js @@ -145,7 +145,7 @@ MTrackWeb.Layout = new Roo.XComponent({ xtype: 'HttpProxy', xns: Roo.data, method : 'GET', - url : baseURL + '/Roo/Projects.php' + url : baseURL + '/Roo/core_project.php' }, reader : { xtype: 'JsonReader', diff --git a/MTrackWeb/templates/images/MTrackWeb/MTrackWeb.Tab.TicketView.js b/MTrackWeb/templates/images/MTrackWeb/MTrackWeb.Tab.TicketView.js index 6a4a321c..9ec27c38 100644 --- a/MTrackWeb/templates/images/MTrackWeb/MTrackWeb.Tab.TicketView.js +++ b/MTrackWeb/templates/images/MTrackWeb/MTrackWeb.Tab.TicketView.js @@ -831,7 +831,7 @@ MTrackWeb.Tab.TicketView = new Roo.XComponent({ xtype: 'HttpProxy', xns: Roo.data, method : 'GET', - url : baseURL + '/Roo/Projects.php' + url : baseURL + '/Roo/core_project.php' }, reader : { xtype: 'JsonReader', diff --git a/MTrackWeb/templates/images/js/mtrack.js b/MTrackWeb/templates/images/js/mtrack.js index 7c32f91f..0ec4f41c 100644 --- a/MTrackWeb/templates/images/js/mtrack.js +++ b/MTrackWeb/templates/images/js/mtrack.js @@ -123,7 +123,7 @@ $(document).ready(function() { $('#banner select').change( function(e) { // ajax change project, and refresh body.. jQuery.ajax({ - url : baseURL + '/Project.html', + url : baseURL + '/core_project.html', data : { active_project_id : this.value }, success : function() { // what if it's false..currentURL = false; diff --git a/MTrackWeb/templates/images/js/mtrack.project.js b/MTrackWeb/templates/images/js/mtrack.project.js index ec929cef..728552af 100644 --- a/MTrackWeb/templates/images/js/mtrack.project.js +++ b/MTrackWeb/templates/images/js/mtrack.project.js @@ -107,7 +107,7 @@ MTrack.register('.mtrack-perm', 'click', function(event) { //console.log($(this).attr('name')); var nar = $(this).attr('name').split('_'); jQuery.ajax({ - url: baseURL+'/Project', + url: baseURL+'/core_project', type : 'POST', data: { action : 'perm', @@ -132,7 +132,7 @@ MTrack.Project = { var nar = $(e).attr('name').split('_'); jQuery.ajax({ - url: baseURL+'/Project', + url: baseURL+'/core_project', type : 'POST', data: { action : 'role', diff --git a/MTrackWeb/templates/images/js/mtrack2.js b/MTrackWeb/templates/images/js/mtrack2.js index 4e822094..cfcfe619 100644 --- a/MTrackWeb/templates/images/js/mtrack2.js +++ b/MTrackWeb/templates/images/js/mtrack2.js @@ -322,7 +322,7 @@ Roo.onReady(function() { // ajax change project, and refresh body.. Roo.Ajax.request({ method: 'GET', - url : baseURL + '/Project.html', + url : baseURL + '/core_project', params : { active_project_id : this.value }, success : function() { // what if it's false..currentURL = false; -- 2.39.2