Browse Source

HUE-6053 [home] Ignore history docs and fix links in trash confirmation popup

krish 8 years ago
parent
commit
ae7b1e33f2

+ 1 - 1
desktop/core/src/desktop/api2.py

@@ -219,7 +219,7 @@ def _get_document_helper(request, uuid, with_data, with_dependencies, path):
 
 
   if with_dependencies:
   if with_dependencies:
     response['dependencies'] = [dependency.to_dict() for dependency in document.dependencies.all()]
     response['dependencies'] = [dependency.to_dict() for dependency in document.dependencies.all()]
-    response['dependents'] = [dependent.to_dict() for dependent in document.dependents.all()]
+    response['dependents'] = [dependent.to_dict() for dependent in document.dependents.exclude(is_history=True).all()]
 
 
   # Get children documents if this is a directory
   # Get children documents if this is a directory
   if document.is_directory:
   if document.is_directory:

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

@@ -579,7 +579,7 @@ from desktop.views import _ko
               (${_('used by')}
               (${_('used by')}
               <a class="pointer" data-bind="attr: { 'href': $data.dependents[0].absoluteUrl }, text: $data.dependents[0].name" target="_blank" ></a>
               <a class="pointer" data-bind="attr: { 'href': $data.dependents[0].absoluteUrl }, text: $data.dependents[0].name" target="_blank" ></a>
               <!-- ko if: $data.dependents.length > 1 -->
               <!-- ko if: $data.dependents.length > 1 -->
-              ${_('and')} <a class="pointer" data-bind="attr: { 'href': $data.dependents[0].absoluteUrl }, text: $data.dependents[1].name" target="_blank" ></a>
+              ${_('and')} <a class="pointer" data-bind="attr: { 'href': $data.dependents[1].absoluteUrl }, text: $data.dependents[1].name" target="_blank" ></a>
                 <!-- ko if: $data.dependents.length > 2 -->
                 <!-- ko if: $data.dependents.length > 2 -->
                   ${_('and')} <span data-bind="text: $data.dependents.length - 2"></span> ${_('other')}
                   ${_('and')} <span data-bind="text: $data.dependents.length - 2"></span> ${_('other')}
                 <!-- /ko -->
                 <!-- /ko -->