Move templates (commonly used legacy grid code) from reports to legacy

galaxyproject · Dec 14, 2017 · 8db84be · 8db84be
1 parent 8ecb6ec
commit 8db84be
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/lib/galaxy/webapps/reports/framework/grids.py b/lib/galaxy/webapps/reports/framework/grids.py
@@ -23,8 +23,8 @@ class Grid(object):
     title = ""
     model_class = None
     show_item_checkboxes = False
-    template = "webapps/reports/grid_base.mako"
-    async_template = "webapps/reports/grid_base_async.mako"
+    template = "legacy/grid_base.mako"
+    async_template = "legacy/grid_base_async.mako"
     use_async = False
     use_hide_message = True
     global_actions = []

diff --git a/templates/webapps/reports/grid_base.mako → templates/legacy/grid_base.mako b/templates/webapps/reports/grid_base.mako → templates/legacy/grid_base.mako
@@ -64,7 +64,7 @@
 
     ## load javascript
     <script type="text/javascript">
-        require(['reports/grid/grid-view'], function(GridView) {
+        require(['legacy/grid/grid-view'], function(GridView) {
             $(function() {
                 var gridView = new GridView.default( ${ h.dumps( self.get_grid_config( embedded=embedded, insert=insert ) ) } );
             });

diff --git a/templates/legacy/grid_base_async.mako b/templates/legacy/grid_base_async.mako
@@ -0,0 +1,4 @@
+<%namespace name="grid_base" file="/legacy/grid_base.mako" import="*" />
+
+${init()}
+${h.dumps( grid_base.get_grid_config() )}
diff --git a/templates/webapps/reports/grid_base_async.mako b/templates/webapps/reports/grid_base_async.mako
diff --git a/templates/webapps/tool_shed/category/grid.mako b/templates/webapps/tool_shed/category/grid.mako
@@ -1,5 +1,5 @@
 <%inherit file="/base.mako"/>
-<%namespace name="grid_base" file="/webapps/reports/grid_base.mako" import="*" />
+<%namespace name="grid_base" file="/legacy/grid_base.mako" import="*" />
 <%namespace name="grid_common" file="../common/grid_common.mako" import="*" />
 
 <%def name="insert()">

diff --git a/templates/webapps/tool_shed/category/valid_grid.mako b/templates/webapps/tool_shed/category/valid_grid.mako
@@ -1,5 +1,5 @@
 <%inherit file="/base.mako"/>
-<%namespace name="grid_base" file="/webapps/reports/grid_base.mako" import="*" />
+<%namespace name="grid_base" file="/legacy/grid_base.mako" import="*" />
 <%namespace name="grid_common" file="../common/grid_common.mako" import="*" />
 
 <%def name="insert()">

diff --git a/templates/webapps/tool_shed/repository_review/grid.mako b/templates/webapps/tool_shed/repository_review/grid.mako
@@ -1 +1 @@
-<%inherit file="/webapps/reports/grid_base.mako"/>
+<%inherit file="/legacy/grid_base.mako"/>