From 0bb3123a6776f782853971838af80a2227077555 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 6 Jul 2015 11:18:12 -0400
Subject: [PATCH] FIX: link to logster when served from a subfolder
---
.../javascripts/admin/components/admin-nav-item.js.es6 | 4 ++++
.../admin/templates/components/admin-nav-item.hbs | 6 +++++-
app/assets/javascripts/admin/templates/logs.hbs | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/admin/components/admin-nav-item.js.es6 b/app/assets/javascripts/admin/components/admin-nav-item.js.es6
index f5acc94a1..c50741820 100644
--- a/app/assets/javascripts/admin/components/admin-nav-item.js.es6
+++ b/app/assets/javascripts/admin/components/admin-nav-item.js.es6
@@ -6,6 +6,10 @@ export default Ember.Component.extend({
return this.container.lookup('router:main');
}.property(),
+ fullPath: function() {
+ return Discourse.getURL(this.get('path'));
+ }.property('path'),
+
active: function() {
const route = this.get('route');
if (!route) { return; }
diff --git a/app/assets/javascripts/admin/templates/components/admin-nav-item.hbs b/app/assets/javascripts/admin/templates/components/admin-nav-item.hbs
index d6341fdce..ec8e0a1e7 100644
--- a/app/assets/javascripts/admin/templates/components/admin-nav-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-nav-item.hbs
@@ -4,6 +4,10 @@
{{#if route}}
{{#link-to route}}{{i18n label}}{{/link-to}}
{{else}}
- <a href="{{unbound href}}" data-auto-route="true">{{i18n label}}</a>
+ {{#if path}}
+ <a href="{{unbound fullPath}}" data-auto-route="true">{{i18n label}}</a>
+ {{else}}
+ <a href="{{unbound href}}" data-auto-route="true">{{i18n label}}</a>
+ {{/if}}
{{/if}}
{{/if}}
diff --git a/app/assets/javascripts/admin/templates/logs.hbs b/app/assets/javascripts/admin/templates/logs.hbs
index 38654fefc..1238e6b5d 100644
--- a/app/assets/javascripts/admin/templates/logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs.hbs
@@ -4,7 +4,7 @@
{{admin-nav-item route='adminLogs.screenedIpAddresses' label='admin.logs.screened_ips.title'}}
{{admin-nav-item route='adminLogs.screenedUrls' label='admin.logs.screened_urls.title'}}
{{#if currentUser.admin}}
- {{admin-nav-item href='/logs' label='admin.logs.logster.title'}}
+ {{admin-nav-item path='/logs' label='admin.logs.logster.title'}}
{{/if}}
{{/admin-nav}}