Преглед изворни кода

[home2] Use updated API response structure

Johan Ahlen пре 9 година
родитељ
комит
8d58137

+ 11 - 5
desktop/core/src/desktop/static/desktop/js/fileBrowser/hueFileEntry.js

@@ -103,12 +103,9 @@
       self.assistHelper.fetchDocuments({
         path: self.path,
         successCallback: function(data) {
-          self.definition = data.file;
+          self.definition = data.directory;
           self.hasErrors(false);
-          var cleanEntries = $.grep(data.documents, function (definition) {
-            return definition.name !== '/';
-          });
-          self.entries($.map(cleanEntries, function (definition) {
+          self.entries($.map(data.documents, function (definition) {
             return new HueFileEntry({
               activeEntry: self.activeEntry,
               assistHelper: self.assistHelper,
@@ -117,6 +114,15 @@
               parent: self
             })
           }));
+          if (! self.parent && data.parent) {
+            self.parent = new HueFileEntry({
+              activeEntry: self.activeEntry,
+              assistHelper: self.assistHelper,
+              definition: data.parent,
+              app: self.app,
+              parent: null
+            });
+          }
           self.loading(false);
           self.loaded(true);
         },

+ 1 - 1
desktop/core/src/desktop/templates/file_browser.mako

@@ -230,7 +230,7 @@ from desktop.views import _ko
               <!-- /ko -->
 
               <!-- ko foreach: breadcrumbs -->
-              <li><a href="javascript:void(0);" data-bind="text: isRoot ? '${ _('My documents') }' : name, click: makeActive"></a> <span class="divider">&gt;</span></li>
+              <li><a href="javascript:void(0);" data-bind="text: isRoot ? '${ _('My documents') }' : name, click: open"></a> <span class="divider">&gt;</span></li>
               <!-- /ko -->
               <!-- ko ifNot: isRoot -->
               <li class="active-breadcrumb" data-bind="text: name"></li>