From: Alan Knowles Date: Tue, 5 Jan 2021 08:34:32 +0000 (+0800) Subject: sync X-Git-Url: http://git.roojs.org/?p=web.mtrack;a=commitdiff_plain;h=5b03fd4edce263ae2773ce83a352095fd3557cce sync --- diff --git a/MTrackWeb/Wiki.php b/MTrackWeb/Wiki.php index eccf5c1e..06d8431a 100644 --- a/MTrackWeb/Wiki.php +++ b/MTrackWeb/Wiki.php @@ -44,8 +44,7 @@ class MTrackWeb_Wiki extends MTrackWeb $p = DB_DataObject::Factory('Mtrack_wiki'); $p->project_id = $this->currentProject(); - var_dump($p->project_id); - + $p->path = $pi; diff --git a/MTrackWeb/templates/images/js/mtrack.project.js b/MTrackWeb/templates/images/js/mtrack.project.js index 728552af..ec929cef 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+'/core_project', + url: baseURL+'/Project', type : 'POST', data: { action : 'perm', @@ -132,7 +132,7 @@ MTrack.Project = { var nar = $(e).attr('name').split('_'); jQuery.ajax({ - url: baseURL+'/core_project', + url: baseURL+'/Project', type : 'POST', data: { action : 'role', diff --git a/MTrackWeb/templates/images/js/mtrack2.js b/MTrackWeb/templates/images/js/mtrack2.js index cfcfe619..8bc2bbba 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 + '/core_project', + url : baseURL + '/Project', params : { active_project_id : this.value }, success : function() { // what if it's false..currentURL = false;