You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by pa...@apache.org on 2016/06/28 17:49:49 UTC

ambari git commit: AMBARI-17398. FilesView: Adopt front-end assets to support proxy (pallavkul)

Repository: ambari
Updated Branches:
  refs/heads/trunk cf880469a -> 29f4c4929


AMBARI-17398. FilesView: Adopt front-end assets to support proxy (pallavkul)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/29f4c492
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/29f4c492
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/29f4c492

Branch: refs/heads/trunk
Commit: 29f4c492996e9ea03245a092fa89908f47c898fe
Parents: cf88046
Author: Pallav Kulshreshtha <pa...@gmail.com>
Authored: Tue Jun 28 23:19:09 2016 +0530
Committer: Pallav Kulshreshtha <pa...@gmail.com>
Committed: Tue Jun 28 23:19:09 2016 +0530

----------------------------------------------------------------------
 .../files/src/main/resources/ui/app/mixins/file-operation.js  | 7 -------
 contrib/views/files/src/main/resources/ui/ember-cli-build.js  | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/29f4c492/contrib/views/files/src/main/resources/ui/app/mixins/file-operation.js
----------------------------------------------------------------------
diff --git a/contrib/views/files/src/main/resources/ui/app/mixins/file-operation.js b/contrib/views/files/src/main/resources/ui/app/mixins/file-operation.js
index 6f4d070..bdf44fa 100644
--- a/contrib/views/files/src/main/resources/ui/app/mixins/file-operation.js
+++ b/contrib/views/files/src/main/resources/ui/app/mixins/file-operation.js
@@ -25,13 +25,6 @@ import Ember from 'ember';
 export default Ember.Mixin.create({
   store: Ember.inject.service('store'),
 
-  getBaseFilesURLPath: function() {
-    // TODO: This has to be changed when it is integrated inside Ambari
-    //var pathName = window.location.pathname;
-    var pathname = '/api/v1/views/FILES/versions/1.0.0/instances/Files/resources/files';
-    return pathname;
-  },
-
   getBaseDirPath: function(path) {
     return path.substring(0, path.lastIndexOf('/') + 1);
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/29f4c492/contrib/views/files/src/main/resources/ui/ember-cli-build.js
----------------------------------------------------------------------
diff --git a/contrib/views/files/src/main/resources/ui/ember-cli-build.js b/contrib/views/files/src/main/resources/ui/ember-cli-build.js
index ab684c4..88089fb 100644
--- a/contrib/views/files/src/main/resources/ui/ember-cli-build.js
+++ b/contrib/views/files/src/main/resources/ui/ember-cli-build.js
@@ -27,6 +27,9 @@ module.exports = function(defaults) {
       paths: [
         'bower_components/bootstrap/less'
       ]
+    },
+    fingerprint: {
+      enabled: false
     }
   });