Browse Source

Merge pull request 'staging' (#18) from staging into master

Reviewed-on: ordo/adw-gantt#18
pull/1/head
ibnu 1 year ago
parent
commit
967ea3108b
  1. 9
      view-mode/function/restActivityLink.js

9
view-mode/function/restActivityLink.js

@ -6,11 +6,8 @@ window.addEventListener('message', function(event) {
if (event.data && event.data.action === 'sendUrl') { if (event.data && event.data.action === 'sendUrl') {
const parentUrl = event.data.url; const parentUrl = event.data.url;
// Remove the base URL and hash
const path = parentUrl.replace("https://adw.ospro.id/#/dashboard-project/", "");
// Split the remaining path by "/" // Split the remaining path by "/"
parts = path.split("/"); parts = parentUrl.split("/");
} }
}); });
gantt.ajax.get({ gantt.ajax.get({
@ -39,7 +36,7 @@ gantt.ajax.get({
} }
} }
if(!parts[2]){ if(!parts[7]){
gantt.silent(function () { gantt.silent(function () {
gantt.parse(data); gantt.parse(data);
earliest = getEarliestTaskDate(); earliest = getEarliestTaskDate();
@ -63,7 +60,7 @@ function refresData(id){
data['data'] = obj.data.data; data['data'] = obj.data.data;
data['links'] = obj.data.links; data['links'] = obj.data.links;
// console.log("data parse wrong", data); // console.log("data parse wrong", data);
if(!parts[2]){ if(!parts[7]){
gantt.silent(function () { gantt.silent(function () {
gantt.parse(data); gantt.parse(data);
earliest = getEarliestTaskDate(); earliest = getEarliestTaskDate();

Loading…
Cancel
Save