Преглед на файлове

HUE-6369 [jb] Port format_preserving_redirect to Hue 4

Home button on edit file in File Browser redirecting to Hue 3
Romain Rigaux преди 8 години
родител
ревизия
c7c4a8c979
променени са 2 файла, в които са добавени 15 реда и са изтрити 6 реда
  1. 12 6
      apps/filebrowser/src/filebrowser/templates/fb_components.mako
  2. 3 0
      desktop/core/src/desktop/lib/django_util.py

+ 12 - 6
apps/filebrowser/src/filebrowser/templates/fb_components.mako

@@ -30,14 +30,20 @@ from aws import get_client
             </span>
           </li>
         %else:
-          <li><a class="pointer breadcrumb-link homeLink" data-bind="click: $root.openHome, attr:{'href': '${url('filebrowser.views.view', path=urlencode(path))}?default_to_home'}"><i class="fa fa-home"></i> ${_('Home')}</a></li>
+          <li><a class="pointer breadcrumb-link homeLink" data-bind="click: $root.openHome, attr:{'href': '${url('filebrowser.views.view', path=urlencode(path))}?default_to_home'}">
+            <i class="fa fa-home"></i> ${_('Home')}</a>
+          </li>
         %endif
         <li>
-            <ul id="editBreadcrumb" class="hue-breadcrumbs editable-breadcrumbs" data-bind="foreach: breadcrumbs" style="padding-right:40px; padding-top: 12px" title="${_('Edit path')}">
-                <li data-bind="visible: label.slice(-1) == '/'"><a data-bind="click: show, attr:{'href': '${url('filebrowser.views.view', path=urlencode(''))}' + url}"><span class="divider" data-bind="text: label"></span></a></li>
-                <li data-bind="visible: label.slice(-1) != '/'"><a data-bind="text: label, click: show, attr:{'href': '${url('filebrowser.views.view', path=urlencode(''))}' + url}"></a><span class="divider">/</span></li>
-            </ul>
-            <input id="hueBreadcrumbText" type="text" style="display:none" data-bind="value: currentPath" autocomplete="off" />
+          <ul id="editBreadcrumb" class="hue-breadcrumbs editable-breadcrumbs" data-bind="foreach: breadcrumbs" style="padding-right:40px; padding-top: 12px" title="${_('Edit path')}">
+            <li data-bind="visible: label.slice(-1) == '/'">
+              <a data-bind="click: show, attr: {'href': '${url('filebrowser.views.view', path=urlencode(''))}' + url}"><span class="divider" data-bind="text: label"></span></a>
+            </li>
+            <li data-bind="visible: label.slice(-1) != '/'">
+              <a data-bind="text: label, click: show, attr: {'href': '${url('filebrowser.views.view', path=urlencode(''))}' + url}"></a><span class="divider">/</span>
+            </li>
+          </ul>
+          <input id="hueBreadcrumbText" type="text" style="display:none" data-bind="value: currentPath" autocomplete="off" />
         </li>
         % if is_trash_enabled:
         <li class="pull-right">

+ 3 - 0
desktop/core/src/desktop/lib/django_util.py

@@ -172,6 +172,9 @@ def format_preserving_redirect(request, target, get_dict=None):
   if get_dict:
     my_get_dict.update(get_dict)
 
+  if request.GET.get('is_embeddable', False):
+    my_get_dict['is_embeddable'] = True
+
   if is_jframe_request(request):
     logging.info("JFrame redirection" +  target)
     my_get_dict['format'] = 'embed'