Эх сурвалжийг харах

HUE-5853 [oozie] Revert embeddability of lists

Enrico Berti 8 жил өмнө
parent
commit
9b5e606

+ 1 - 6
apps/oozie/src/oozie/templates/editor2/list_editor_bundles.mako

@@ -23,10 +23,7 @@
 <%namespace name="layout" file="../navigation-bar.mako" />
 <%namespace name="utils" file="../utils.inc.mako" />
 
-%if not is_embeddable:
 ${ commonheader(_("Bundles"), "oozie", user, request) | n,unicode }
-%endif
-
 ${ layout.menubar(section='bundles', is_editor=True) }
 
 <div id="editor">
@@ -95,7 +92,7 @@ ${ layout.menubar(section='bundles', is_editor=True) }
             <a data-bind="attr: { 'href': '${ url('oozie:open_old_bundle') }?bundle=' + id() }" data-row-selector="true"></a>
           <!-- /ko -->
           <!-- ko if: uuid() -->
-            <a data-bind="attr: { 'href': '${ is_embeddable and '/hue' or '' }${ url('oozie:edit_bundle') }?bundle=' + id() }" data-row-selector="true"></a>
+            <a data-bind="attr: { 'href': '${ url('oozie:edit_bundle') }?bundle=' + id() }" data-row-selector="true"></a>
           <!-- /ko -->
         </td>
         <td data-bind="text: name"></td>
@@ -295,6 +292,4 @@ ${ commonimportexport(request) | n,unicode }
   });
 </script>
 
-%if not is_embeddable:
 ${commonfooter(request, messages) | n,unicode}
-%endif

+ 1 - 6
apps/oozie/src/oozie/templates/editor2/list_editor_coordinators.mako

@@ -22,10 +22,7 @@
 <%namespace name="layout" file="../navigation-bar.mako" />
 <%namespace name="utils" file="../utils.inc.mako" />
 
-%if not is_embeddable:
 ${ commonheader(_("Coordinators"), "oozie", user, request) | n,unicode }
-%endif
-
 ${ layout.menubar(section='coordinators', is_editor=True) }
 
 <div id="editor">
@@ -94,7 +91,7 @@ ${ layout.menubar(section='coordinators', is_editor=True) }
             <a data-bind="attr: { 'href': '${ url('oozie:open_old_coordinator') }?coordinator=' + id() }" data-row-selector="true"></a>
           <!-- /ko -->
           <!-- ko if: uuid() -->
-            <a data-bind="attr: { 'href': '${ is_embeddable and '/hue' or '' }${ url('oozie:edit_coordinator') }?coordinator=' + id() }" data-row-selector="true"></a>
+            <a data-bind="attr: { 'href': '${ url('oozie:edit_coordinator') }?coordinator=' + id() }" data-row-selector="true"></a>
           <!-- /ko -->
         </td>
         <td data-bind="text: name"></td>
@@ -292,6 +289,4 @@ ${ commonimportexport(request) | n,unicode }
   });
 </script>
 
-%if not is_embeddable:
 ${commonfooter(request, messages) | n,unicode}
-%endif

+ 1 - 4
apps/oozie/src/oozie/templates/editor2/list_editor_workflows.mako

@@ -22,10 +22,7 @@
 <%namespace name="layout" file="../navigation-bar.mako" />
 <%namespace name="utils" file="../utils.inc.mako" />
 
-%if not is_embeddable:
 ${ commonheader(_("Workflows"), "oozie", user, request) | n,unicode }
-%endif
-
 ${ layout.menubar(section='workflows', is_editor=True) }
 
 <div id="editor">
@@ -94,7 +91,7 @@ ${ layout.menubar(section='workflows', is_editor=True) }
             <a data-bind="attr: { 'href': '${ url('oozie:open_old_workflow') }?workflow=' + id() }" data-row-selector="true"></a>
           <!-- /ko -->
           <!-- ko if: uuid() -->
-            <a data-bind="attr: { 'href': '${ is_embeddable and '/hue' or '' }${ url('oozie:edit_workflow') }?workflow=' + id() }" data-row-selector="true"></a>
+            <a data-bind="attr: { 'href': '${ url('oozie:edit_workflow') }?workflow=' + id() }" data-row-selector="true"></a>
           <!-- /ko -->
         </td>
         <td data-bind="text: name"></td>

+ 0 - 3
apps/oozie/src/oozie/views/editor2.py

@@ -65,7 +65,6 @@ def list_editor_workflows(request):
 
   return render('editor2/list_editor_workflows.mako', request, {
     'workflows_json': json.dumps(workflows, cls=JSONEncoderForHTML),
-    'is_embeddable': request.GET.get('is_embeddable', False),
   })
 
 
@@ -467,7 +466,6 @@ def list_editor_coordinators(request):
 
   return render('editor2/list_editor_coordinators.mako', request, {
     'coordinators_json': json.dumps(coordinators, cls=JSONEncoderForHTML),
-    'is_embeddable': request.GET.get('is_embeddable', False),
   })
 
 
@@ -727,7 +725,6 @@ def list_editor_bundles(request):
 
   return render('editor2/list_editor_bundles.mako', request, {
     'bundles_json': json.dumps(bundles, cls=JSONEncoderForHTML),
-    'is_embeddable': request.GET.get('is_embeddable', False),
   })