Merge pull request #7 from angular-dashboard-framework/feature/6_redi…

…rect_endpoint Create option for redirect endpoint #6
angular-dashboard-framework · Feb 1, 2019 · 8680ba7 · 8680ba7
2 parents bd37e6c + 721358e
commit 8680ba7
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/dist/adf-widget-redmine.js b/dist/adf-widget-redmine.js
@@ -3,6 +3,7 @@
 
 angular.module('adf.widget.redmine', ['adf.provider', 'chart.js', 'ui.bootstrap.datepicker'])
   .constant('redmineEndpoint', 'http://www.redmine.org/')
+  .constant('redmineRedirectEndpoint', null)
   .config(["dashboardProvider", function (dashboardProvider) {
     var category = 'Redmine';
 
@@ -294,7 +295,11 @@ angular.module('adf.widget.redmine')
       }
     }
 
-    vm.issueUrl = redmineService.getRedmineEndpoint() + 'issues/';
+    var redirectEndpoint = redmineService.getRedmineRedirectEndpoint();
+    if (!redirectEndpoint) {
+      redirectEndpoint = redmineService.getRedmineEndpoint();
+    }
+    vm.issueUrl = redirectEndpoint + 'issues/';
 
     vm.order = 'id';
 
@@ -443,7 +448,7 @@ angular.module('adf.widget.redmine')
 
 
 angular.module('adf.widget.redmine')
-  .factory('redmineService', ["$http", "redmineEndpoint", "$q", function ($http, redmineEndpoint, $q) {
+  .factory('redmineService', ["$http", "redmineEndpoint", "redmineRedirectEndpoint", "$q", function ($http, redmineEndpoint, redmineRedirectEndpoint, $q) {
 
     function extractData(response) {
       return response.data;
@@ -586,6 +591,10 @@ angular.module('adf.widget.redmine')
       return redmineEndpoint;
     }
 
+    function getRedmineRedirectEndpoint(){
+      return redmineRedirectEndpoint;
+    }
+
     function getTrackers() {
       return request('trackers.json').then(function (data) {
         return data.trackers;
@@ -606,8 +615,9 @@ angular.module('adf.widget.redmine')
       getCustomQueries: getCustomQueries,
       getIssuesByQueryId: getIssuesByQueryId,
       getRedmineEndpoint: getRedmineEndpoint,
+      getRedmineRedirectEndpoint: getRedmineRedirectEndpoint,
       getTrackers: getTrackers,
       getMyIssues : getMyIssues
     };
   }]);
-})(window);
+})(window);
diff --git a/dist/adf-widget-redmine.min.js b/dist/adf-widget-redmine.min.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -14,7 +14,7 @@ var annotateOptions = {
 };
 
 var templateOptions = {
-  root: '{widgetsPath}/redmine/src',
+  root: '{widgetsPath}/redmine/src/main',
   module: 'adf.widget.redmine'
 };
 

diff --git a/src/main/issues/issueController.js b/src/main/issues/issueController.js
@@ -29,7 +29,11 @@ angular.module('adf.widget.redmine')
       }
     }
 
-    vm.issueUrl = redmineService.getRedmineEndpoint() + 'issues/';
+    var redirectEndpoint = redmineService.getRedmineRedirectEndpoint();
+    if (!redirectEndpoint) {
+      redirectEndpoint = redmineService.getRedmineEndpoint();
+    }
+    vm.issueUrl = redirectEndpoint + 'issues/';
 
     vm.order = 'id';
 

diff --git a/src/main/redmine.js b/src/main/redmine.js
@@ -2,6 +2,7 @@
 
 angular.module('adf.widget.redmine', ['adf.provider', 'chart.js', 'ui.bootstrap.datepicker'])
   .constant('redmineEndpoint', 'http://www.redmine.org/')
+  .constant('redmineRedirectEndpoint', null)
   .config(function (dashboardProvider) {
     var category = 'Redmine';
 

diff --git a/src/main/service.js b/src/main/service.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('adf.widget.redmine')
-  .factory('redmineService', function ($http, redmineEndpoint, $q) {
+  .factory('redmineService', function ($http, redmineEndpoint, redmineRedirectEndpoint, $q) {
 
     function extractData(response) {
       return response.data;
@@ -144,6 +144,10 @@ angular.module('adf.widget.redmine')
       return redmineEndpoint;
     }
 
+    function getRedmineRedirectEndpoint(){
+      return redmineRedirectEndpoint;
+    }
+
     function getTrackers() {
       return request('trackers.json').then(function (data) {
         return data.trackers;
@@ -164,6 +168,7 @@ angular.module('adf.widget.redmine')
       getCustomQueries: getCustomQueries,
       getIssuesByQueryId: getIssuesByQueryId,
       getRedmineEndpoint: getRedmineEndpoint,
+      getRedmineRedirectEndpoint: getRedmineRedirectEndpoint,
       getTrackers: getTrackers,
       getMyIssues : getMyIssues
     };