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

Fix for using non-ascii category name as a link in top_menu

This commit is contained in:
Neil Lalonde 2013-06-14 15:49:48 -04:00
parent f198c814a8
commit 002d4b4e23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/discourse/models/nav_item.js
View File

@ -20,12 +20,23 @@ Discourse.NavItem = Discourse.Model.extend({
return split[0] === 'category' ? split[1] : null;
}.property('name'),
categorySlug: function() {
var split = this.get('name').split('/');
if (split[0] === 'category' && split[1]) {
var cat = Discourse.Site.instance().categories.findProperty('name', split[1]);
return cat ? Discourse.Category.slugFor(cat) : null;
}
return null;
}.property('name'),
// href from this item
href: function() {
var name = this.get('name'),
href = Discourse.getURL("/") + name.replace(' ', '-');
if (name === 'category') href += "/" + this.get('categoryName');
return href;
var name = this.get('name');
if( name.split('/')[0] === 'category' ) {
return Discourse.getURL("/") + 'category/' + this.get('categorySlug');
} else {
return Discourse.getURL("/") + name.replace(' ', '-');
}
}.property('name'),
count: function() {