Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: discourse client should know about Logster (simpler approach) (#7237) 

* Revert "FIX: discourse client should know about Logster (#7232)"

This reverts commit bfcbc4d2d6.

* FIX: discourse client should know about Logster (simpler approach)
This commit is contained in:
Osama Sayegh 2019-03-22 00:48:57 +03:00 committed by Sam
parent 3f9e7eb326
commit 67b96ad2ff
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/lib/url.js.es6
View File

@ -22,7 +22,8 @@ const SERVER_SIDE_ONLY = [
/^\/wizard/,
/\.rss$/,
/\.json$/,
/^\/admin\/upgrade$/
/^\/admin\/upgrade$/,
/^\/logs($|\/)/
];
export function rewritePath(path) {

4
app/assets/javascripts/discourse/routes/app-route-map.js.es6
View File

@ -3,10 +3,6 @@ export default function() {
this.route("exception", { path: "/exception" });
this.route("exception-unknown", { path: "/404" });
this.route("logster", { path: "/logs" }, function() {
this.route("logster-routes", { path: "*path" });
});
this.route("about", { path: "/about", resetNamespace: true });
this.route("post", { path: "/p/:id" });

18
app/assets/javascripts/discourse/routes/logster.js.es6
View File

@ -1,18 +0,0 @@
import getURL from "discourse-common/lib/get-url";
import { getOwner } from "discourse-common/lib/get-owner";
export default Discourse.Route.extend({
beforeModel(transition) {
const router = getOwner(this).lookup("router:main");
const currentURL = router.get("currentURL");
transition.abort();
// hack due to Ember bug https://github.com/emberjs/ember.js/issues/5210
// aborting the transition should revert the address bar to the
// previous route's url, otherwise we will end up with a broken
// back button
// workaround is to update the address bar ourselves
router.location.setURL(router.url);
window.location.href = getURL(currentURL);
}
});