mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Reroute page display to client
This commit is contained in:
@@ -37,6 +37,7 @@ import InvocationReport from "components/Workflow/InvocationReport";
|
||||
import JobDetails from "components/JobInformation/JobDetails";
|
||||
import NewUserConfirmation from "components/login/NewUserConfirmation";
|
||||
import NewUserWelcome from "components/NewUserWelcome/NewUserWelcome";
|
||||
import PageDisplay from "components/PageDisplay/PageDisplay";
|
||||
import PageEditor from "components/PageEditor/PageEditor";
|
||||
import Sharing from "components/Sharing/Sharing";
|
||||
import StoredWorkflowInvocations from "components/Workflow/StoredWorkflowInvocations";
|
||||
@@ -81,6 +82,13 @@ export function getRouter(Galaxy) {
|
||||
...AdminRoutes,
|
||||
...LibraryRoutes,
|
||||
{ path: "/login/start", component: Login },
|
||||
{
|
||||
path: "/pages/display",
|
||||
component: PageDisplay,
|
||||
props: (route) => ({
|
||||
pageId: route.query.id,
|
||||
}),
|
||||
},
|
||||
{
|
||||
path: "/pages/editor",
|
||||
component: PageEditor,
|
||||
|
||||
@@ -227,6 +227,7 @@ def app_pair(global_conf, load_app_kwds=None, wsgi_preflight=True, **kwargs):
|
||||
webapp.add_client_route("/pages/list")
|
||||
webapp.add_client_route("/pages/list_published")
|
||||
webapp.add_client_route("/pages/create")
|
||||
webapp.add_client_route("/pages/display")
|
||||
webapp.add_client_route("/pages/edit")
|
||||
webapp.add_client_route("/pages/editor")
|
||||
webapp.add_client_route("/pages/sharing")
|
||||
|
||||
@@ -575,7 +575,7 @@ class PageController(BaseUIController, SharableMixin, UsesStoredWorkflowMixin, U
|
||||
else:
|
||||
user_item_rating = 0
|
||||
ave_item_rating, num_ratings = self.get_ave_item_rating_data(trans.sa_session, page)
|
||||
|
||||
return trans.response.send_redirect(web.url_for(controller="pages", action="display", id=page_content))
|
||||
return trans.fill_template_mako(
|
||||
template,
|
||||
item=page,
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
<%inherit file="/display_base.mako"/>
|
||||
|
||||
<%def name="javascript_app()">
|
||||
|
||||
${parent.javascript_app()}
|
||||
|
||||
<script type="text/javascript">
|
||||
config.addInitialization(function() {
|
||||
console.log("page/display.mako, javascript_app", "Setup embedded content");
|
||||
|
||||
Reference in New Issue
Block a user