Explorar o código

merge AriaNg commit (https://github.com/mayswind/AriaNg/commit/01c7dd557fd93a9a3e4a08dee701dc0fb939587f)

MaysWind %!s(int64=2) %!d(string=hai) anos
pai
achega
d6ad00a107
Modificáronse 1 ficheiros con 12 adicións e 2 borrados
  1. 12 2
      app/scripts/directives/exportCommandApiDialog.js

+ 12 - 2
app/scripts/directives/exportCommandApiDialog.js

@@ -18,8 +18,18 @@
                     isCopied: false
                 };
 
+                var getBaseUrl = function () {
+                    var baseUrl = scope.context.baseUrl;
+
+                    if (baseUrl.indexOf('#') >= 0) {
+                        baseUrl = baseUrl.substring(0, baseUrl.indexOf('#'));
+                    }
+
+                    return baseUrl;
+                };
+
                 var getNewTaskCommandAPIUrl = function (task) {
-                    var commandAPIUrl = scope.context.baseUrl + '#!/new/task?' +
+                    var commandAPIUrl = getBaseUrl() + '#!/new/task?' +
                         'url=' + ariaNgCommonService.base64UrlEncode(task.urls[0]);
 
                     if (scope.context.pauseOnAdded) {
@@ -54,7 +64,7 @@
                 };
 
                 var getSettingCommandAPIUrl = function (setting) {
-                    var commandAPIUrl = scope.context.baseUrl + '#!/settings/rpc/set?' +
+                    var commandAPIUrl = getBaseUrl() + '#!/settings/rpc/set?' +
                         'protocol=' + setting.protocol +
                         '&host=' + setting.rpcHost +
                         '&port=' + setting.rpcPort +