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

FIX: Allow `Discourse.Session.current()` API to update to 0

This commit is contained in:
Robin Ward 2013-08-02 18:48:02 -04:00
parent 91efbc1830
commit 8d08391ff5
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/models/session.js
View File

@ -27,8 +27,8 @@ Discourse.Session.reopenClass({
} }
// If we found the current session // If we found the current session
if (property) { if (typeof property !== "undefined") {
if (value) { if (typeof value !== "undefined") {
this.currentSession.set(property, value); this.currentSession.set(property, value);
} else { } else {
return this.currentSession.get(property); return this.currentSession.get(property);

2
app/assets/javascripts/discourse/models/user.js
View File

@ -301,7 +301,7 @@ Discourse.User.reopenClass({
} }
// If we found the current user // If we found the current user
if (this.currentUser && property) { if (this.currentUser && (typeof property !== "undefined")) {
return this.currentUser.get(property); return this.currentUser.get(property);
} }

2
test/javascripts/models/session_test.js
View File

@ -13,6 +13,8 @@ test('current', function(){
Discourse.Session.current('orange', 'juice'); Discourse.Session.current('orange', 'juice');
equal(session.get('orange'), "juice", "it can be updated"); equal(session.get('orange'), "juice", "it can be updated");
Discourse.Session.current('zero', 0);
equal(session.get('zero'), 0);
}); });
test('highestSeenByTopic', function() { test('highestSeenByTopic', function() {