glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed home page difference between being logged in and logged out

Browse source
This commit is contained in:
Connor Turland 2014-08-12 13:45:29 -04:00
parent 6bdc6ec397
commit 35835fcc80
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/metamaps/Metamaps.js
View file

@ -2248,8 +2248,8 @@ Metamaps.Filter = {
if (Metamaps.Active.Map) { if (Metamaps.Active.Map) {
onMap = true; onMap = true;
passesMapper = true; }
} else passesMapper = true; // for when you're on a topic page
Metamaps.Topics.each(function(topic) { Metamaps.Topics.each(function(topic) {
var n = topic.get('node'); var n = topic.get('node');

9
app/controllers/main_controller.rb
View file

@ -11,7 +11,14 @@ class MainController < ApplicationController
@current = current_user @current = current_user
respond_to do |format| respond_to do |format|
format.html { respond_with(@current) } format.html {
if authenticated?
@maps = Map.order("name ASC").find_all_by_user_id(@current.id)
respond_with(@maps, @current)
else
respond_with(@current)
end
}
end end
end end