Explorar o código

AMBARI-5719. View: Files should not hardcode REST API with view name + instance name. (jaimin)

Jaimin Jetly %!s(int64=11) %!d(string=hai) anos
pai
achega
d329dbcc6a
Modificáronse 1 ficheiros con 14 adicións e 1 borrados
  1. 14 1
      contrib/views/files/src/main/resources/ui/app/adapter.js

+ 14 - 1
contrib/views/files/src/main/resources/ui/app/adapter.js

@@ -147,9 +147,22 @@ Ember.Inflector.inflector.uncountable('fileops');
 Ember.Inflector.inflector.uncountable('download');
 Ember.Inflector.inflector.uncountable('upload');
 
+function getNamespaceUrl() {
+  var parts = window.location.pathname.match(/\/[^\/]*/g);
+  var view = parts[1];
+  var version = '/versions' + parts[2];
+  var instance = parts[3];
+  if (parts.length == 4) { // version is not present
+    instance = parts[2];
+    version = '';
+  }
+  var namespaceUrl = 'api/v1/views' + view + version + '/instances' + instance + '/';
+  return namespaceUrl;
+}
+
 App.Store = DS.Store.extend({
   adapter: DS.RESTAdapter.extend({
-    namespace:'api/v1/views/FILES/instances/FILES_1/resources/files',
+    namespace: getNamespaceUrl() + 'resources/files',
     headers: {
       'X-Requested-By': 'ambari'
     },