opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove dict format from controllers

Browse Source
This commit is contained in:
guerler
2017-12-10 11:00:25 -05:00
parent 134b3cc47f
commit efbd02743e
8 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/admin.py
-5
View File
@@ -559,7 +559,6 @@ class AdminGalaxy(controller.JSAppLauncher, AdminActions, UsesQuotaMixin, QuotaP
if message and status:
kwd['message'] = util.sanitize_text(message)
kwd['status'] = status
kwd['dict_format'] = True
return self.user_list_grid(trans, **kwd)
@web.expose_api
@@ -592,7 +591,6 @@ class AdminGalaxy(controller.JSAppLauncher, AdminActions, UsesQuotaMixin, QuotaP
if message:
kwargs['message'] = util.sanitize_text(message)
kwargs['status'] = status or 'done'
kwargs['dict_format'] = True
return self.quota_list_grid(trans, **kwargs)
@web.expose_api
@@ -902,7 +900,6 @@ class AdminGalaxy(controller.JSAppLauncher, AdminActions, UsesQuotaMixin, QuotaP
@web.expose_api
@web.require_admin
def tool_versions_list(self, trans, **kwd):
kwd['dict_format'] = True
return self.tool_version_list_grid(trans, **kwd)
@web.expose
@@ -923,7 +920,6 @@ class AdminGalaxy(controller.JSAppLauncher, AdminActions, UsesQuotaMixin, QuotaP
message, status = self._undelete_role(trans, ids)
elif operation == 'purge':
message, status = self._purge_role(trans, ids)
kwargs['dict_format'] = True
if message and status:
kwargs['message'] = util.sanitize_text(message)
kwargs['status'] = status
@@ -1168,7 +1164,6 @@ class AdminGalaxy(controller.JSAppLauncher, AdminActions, UsesQuotaMixin, QuotaP
message, status = self._undelete_group(trans, ids)
elif operation == 'purge':
message, status = self._purge_group(trans, ids)
kwargs['dict_format'] = True
if message and status:
kwargs['message'] = util.sanitize_text(message)
kwargs['status'] = status
lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
-1
View File
@@ -88,7 +88,6 @@ class AdminToolshed(AdminGalaxy):
if message and status:
kwd['message'] = util.sanitize_text(message)
kwd['status'] = 'success' if status in ['ok', 'done', 'success'] else 'error'
kwd['dict_format'] = True
return self.installed_repository_grid(trans, **kwd)
@web.expose
lib/galaxy/webapps/galaxy/controllers/dataset.py
-1
View File
@@ -569,7 +569,6 @@ class DatasetInterface(BaseUIController, UsesAnnotations, UsesItemRatings, UsesE
kwargs['refresh_frames'] = ['history']
# Render the list view
kwargs['dict_format'] = True
return self.stored_list_grid(trans, status=status, message=message, **kwargs)
@web.expose
lib/galaxy/webapps/galaxy/controllers/forms.py
-1
View File
@@ -99,7 +99,6 @@ class Forms(BaseUIController):
if message and status:
kwd['message'] = util.sanitize_text(message)
kwd['status'] = status
kwd['dict_format'] = True
return self.forms_grid(trans, **kwd)
@web.expose_api
lib/galaxy/webapps/galaxy/controllers/history.py
-3
View File
@@ -244,7 +244,6 @@ class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesIt
@web.expose
@web.json
def list_published(self, trans, **kwargs):
kwargs['dict_format'] = True
return self.published_list_grid(trans, **kwargs)
@web.expose_api
@@ -314,7 +313,6 @@ class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesIt
trans.sa_session.flush()
# Render the list view
kwargs['dict_format'] = True
if message and status:
kwargs['message'] = sanitize_text(message)
kwargs['status'] = status
@@ -452,7 +450,6 @@ class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesIt
message = "Unshared %d shared histories" % len(ids)
status = 'done'
# Render the list view
kwargs['dict_format'] = True
return self.shared_list_grid(trans, status=status, message=message, **kwargs)
@web.expose
lib/galaxy/webapps/galaxy/controllers/page.py
-7
View File
@@ -320,7 +320,6 @@ class PageController(BaseUIController, SharableMixin,
session.flush()
# Build grid dictionary.
kwargs['dict_format'] = True
grid = self._page_list(trans, *args, **kwargs)
grid['shared_by_others'] = self._get_shared(trans)
return grid
@@ -328,7 +327,6 @@ class PageController(BaseUIController, SharableMixin,
@web.expose
@web.json
def list_published(self, trans, *args, **kwargs):
kwargs['dict_format'] = True
grid = self._all_published_list(trans, *args, **kwargs)
grid['shared_by_others'] = self._get_shared(trans)
return grid
@@ -698,7 +696,6 @@ class PageController(BaseUIController, SharableMixin,
@web.require_login("select a history from saved histories")
def list_histories_for_selection(self, trans, **kwargs):
""" Returns HTML that enables a user to select one or more histories. """
kwargs['dict_format'] = True
return self._history_selection_grid(trans, **kwargs)
@web.expose
@@ -706,7 +703,6 @@ class PageController(BaseUIController, SharableMixin,
@web.require_login("select a workflow from saved workflows")
def list_workflows_for_selection(self, trans, **kwargs):
""" Returns HTML that enables a user to select one or more workflows. """
kwargs['dict_format'] = True
return self._workflow_selection_grid(trans, **kwargs)
@web.expose
@@ -714,7 +710,6 @@ class PageController(BaseUIController, SharableMixin,
@web.require_login("select a visualization from saved visualizations")
def list_visualizations_for_selection(self, trans, **kwargs):
""" Returns HTML that enables a user to select one or more visualizations. """
kwargs['dict_format'] = True
return self._visualization_selection_grid(trans, **kwargs)
@web.expose
@@ -722,7 +717,6 @@ class PageController(BaseUIController, SharableMixin,
@web.require_login("select a page from saved pages")
def list_pages_for_selection(self, trans, **kwargs):
""" Returns HTML that enables a user to select one or more pages. """
kwargs['dict_format'] = True
return self._page_selection_grid(trans, **kwargs)
@web.expose
@@ -730,7 +724,6 @@ class PageController(BaseUIController, SharableMixin,
@web.require_login("select a dataset from saved datasets")
def list_datasets_for_selection(self, trans, **kwargs):
""" Returns HTML that enables a user to select one or more datasets. """
kwargs['dict_format'] = True
return self._datasets_selection_grid(trans, **kwargs)
@web.expose
lib/galaxy/webapps/galaxy/controllers/visualization.py
-6
View File
@@ -240,7 +240,6 @@ class VisualizationController(BaseUIController, SharableMixin, UsesVisualization
@web.require_login("see all available libraries")
def list_libraries(self, trans, **kwargs):
"""List all libraries that can be used for selecting datasets."""
kwargs['dict_format'] = True
return self._libraries_grid(trans, **kwargs)
@web.expose
@@ -249,7 +248,6 @@ class VisualizationController(BaseUIController, SharableMixin, UsesVisualization
def list_history_datasets(self, trans, **kwargs):
"""List a history's datasets that can be added to a visualization."""
kwargs['show_item_checkboxes'] = 'True'
kwargs['dict_format'] = True
return self._history_datasets_grid(trans, **kwargs)
@web.expose
@@ -258,19 +256,16 @@ class VisualizationController(BaseUIController, SharableMixin, UsesVisualization
def list_library_datasets(self, trans, **kwargs):
"""List a library's datasets that can be added to a visualization."""
kwargs['show_item_checkboxes'] = 'True'
kwargs['dict_format'] = True
return self._library_datasets_grid(trans, **kwargs)
@web.expose
@web.json
def list_tracks(self, trans, **kwargs):
kwargs['dict_format'] = True
return self._tracks_grid(trans, **kwargs)
@web.expose
@web.json
def list_published(self, trans, *args, **kwargs):
kwargs['dict_format'] = True
grid = self._published_list_grid(trans, **kwargs)
grid['shared_by_others'] = self._get_shared(trans)
return grid
@@ -292,7 +287,6 @@ class VisualizationController(BaseUIController, SharableMixin, UsesVisualization
self.copy(trans, **kwargs)
session.flush()
kwargs['embedded'] = True
kwargs['dict_format'] = True
if message and status:
kwargs['message'] = sanitize_text(message)
kwargs['status'] = status
lib/galaxy/webapps/galaxy/controllers/workflow.py
-1
View File
@@ -201,7 +201,6 @@ class WorkflowController(BaseUIController, SharableMixin, UsesStoredWorkflowMixi
@web.expose
@web.json
def list_published(self, trans, **kwargs):
kwargs['dict_format'] = True
return self.published_list_grid(trans, **kwargs)
@web.expose