From 330cf78c83a19b5c29afd77b81096bc0c94e80cc Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 26 Jul 2018 14:59:28 -0400 Subject: [PATCH] =?UTF-8?q?FIX:=20don=E2=80=99t=20break=20browser=20histor?= =?UTF-8?q?y=20on=20dashboard=20visit=20(#6186)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin-dashboard-next-moderation.js.es6 | 2 -- .../admin/models/admin-dashboard-next.js.es6 | 2 +- .../admin/routes/admin-dashboard-next.js.es6 | 14 -------------- .../admin/routes/admin-route-map.js.es6 | 7 +++++-- .../javascripts/admin/templates/dashboard_next.hbs | 2 +- .../stylesheets/common/admin/dashboard_next.scss | 2 +- app/controllers/admin/dashboard_next_controller.rb | 3 +++ config/routes.rb | 6 ++++-- ...eneral.js.es6 => dashboard-next-general.js.es6} | 0 test/javascripts/fixtures/dashboard-next.js.es6 | 2 +- 10 files changed, 16 insertions(+), 24 deletions(-) rename test/javascripts/fixtures/{admin-general.js.es6 => dashboard-next-general.js.es6} (100%) diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6 index 0958bc9d62..afe81cbf51 100644 --- a/app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6 @@ -2,8 +2,6 @@ import computed from "ember-addons/ember-computed-decorators"; import PeriodComputationMixin from "admin/mixins/period-computation"; export default Ember.Controller.extend(PeriodComputationMixin, { - exceptionController: Ember.inject.controller("exception"), - @computed flagsStatusOptions() { return { diff --git a/app/assets/javascripts/admin/models/admin-dashboard-next.js.es6 b/app/assets/javascripts/admin/models/admin-dashboard-next.js.es6 index 5ad85c0399..6898f8191a 100644 --- a/app/assets/javascripts/admin/models/admin-dashboard-next.js.es6 +++ b/app/assets/javascripts/admin/models/admin-dashboard-next.js.es6 @@ -6,7 +6,7 @@ const AdminDashboardNext = Discourse.Model.extend({}); AdminDashboardNext.reopenClass({ fetch() { - return ajax("/admin/dashboard-next.json").then(json => { + return ajax("/admin/dashboard.json").then(json => { const model = AdminDashboardNext.create(); model.set("version_check", json.version_check); return model; diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-next.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard-next.js.es6 index 5aa907b55c..b2ace398fe 100644 --- a/app/assets/javascripts/admin/routes/admin-dashboard-next.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-dashboard-next.js.es6 @@ -5,19 +5,5 @@ export default Discourse.Route.extend({ this.controllerFor("admin-dashboard-next").fetchProblems(); this.controllerFor("admin-dashboard-next").fetchDashboard(); scrollTop(); - }, - - afterModel(model, transition) { - if (transition.targetName === "admin.dashboardNext.index") { - this.transitionTo("admin.dashboardNext.general"); - } - }, - - actions: { - willTransition(transition) { - if (transition.targetName === "admin.dashboardNext.index") { - this.transitionTo("admin.dashboardNext.general"); - } - } } }); diff --git a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 b/app/assets/javascripts/admin/routes/admin-route-map.js.es6 index bdcdcd4a96..110ec6231b 100644 --- a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-route-map.js.es6 @@ -3,8 +3,11 @@ export default function() { this.route("dashboard", { path: "/dashboard-old" }); this.route("dashboardNext", { path: "/" }, function() { - this.route("general", { path: "/dashboard/general" }); - this.route("moderation", { path: "/dashboard/moderation" }); + this.route("general", { path: "/" }); + this.route("admin.dashboardNextModeration", { + path: "/dashboard/moderation", + resetNamespace: true + }); }); this.route( diff --git a/app/assets/javascripts/admin/templates/dashboard_next.hbs b/app/assets/javascripts/admin/templates/dashboard_next.hbs index 737593ea3e..176f90c22d 100644 --- a/app/assets/javascripts/admin/templates/dashboard_next.hbs +++ b/app/assets/javascripts/admin/templates/dashboard_next.hbs @@ -17,7 +17,7 @@ {{/link-to}}
  • - {{#link-to "admin.dashboardNext.moderation" class="navigation-link"}} + {{#link-to "admin.dashboardNextModeration" class="navigation-link"}} {{i18n "admin.dashboard.moderation_tab"}} {{/link-to}}
    • diff --git a/app/assets/stylesheets/common/admin/dashboard_next.scss b/app/assets/stylesheets/common/admin/dashboard_next.scss index c30159ef3f..116e2068f7 100644 --- a/app/assets/stylesheets/common/admin/dashboard_next.scss +++ b/app/assets/stylesheets/common/admin/dashboard_next.scss @@ -31,7 +31,7 @@ border-bottom: 10px solid $secondary; } - &.moderation .navigation-item.moderation { + &.dashboard-next-moderation .navigation-item.moderation { @include active-navigation-item; } diff --git a/app/controllers/admin/dashboard_next_controller.rb b/app/controllers/admin/dashboard_next_controller.rb index d2dc8e79a2..a479e20175 100644 --- a/app/controllers/admin/dashboard_next_controller.rb +++ b/app/controllers/admin/dashboard_next_controller.rb @@ -11,6 +11,9 @@ class Admin::DashboardNextController < Admin::AdminController render json: data end + def moderation + end + def general data = AdminDashboardNextGeneralData.fetch_cached_stats diff --git a/config/routes.rb b/config/routes.rb index 3b2e17dd22..3aa24380b5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -236,9 +236,11 @@ Discourse::Application.routes.draw do get "version_check" => "versions#show" - get "dashboard-next" => "dashboard_next#index" - get "dashboard-old" => "dashboard#index" + get "dashboard" => "dashboard_next#index" get "dashboard/general" => "dashboard_next#general" + get "dashboard/moderation" => "dashboard_next#moderation" + + get "dashboard-old" => "dashboard#index" resources :dashboard, only: [:index] do collection do diff --git a/test/javascripts/fixtures/admin-general.js.es6 b/test/javascripts/fixtures/dashboard-next-general.js.es6 similarity index 100% rename from test/javascripts/fixtures/admin-general.js.es6 rename to test/javascripts/fixtures/dashboard-next-general.js.es6 diff --git a/test/javascripts/fixtures/dashboard-next.js.es6 b/test/javascripts/fixtures/dashboard-next.js.es6 index 257c435089..d284b2eb29 100644 --- a/test/javascripts/fixtures/dashboard-next.js.es6 +++ b/test/javascripts/fixtures/dashboard-next.js.es6 @@ -1,5 +1,5 @@ export default { - "/admin/dashboard-next.json": { + "/admin/dashboard.json": { updated_at: "2018-04-25T08:06:11.292Z" } };