app/views/zack/roles.haml @@ -32,15 +32,21 @@ class ApplicationController < ActionController::Base begin @facebook_session = session[:facebook_session] @user = @facebook_session.user + @user.pic rescue StandardError=>exc @user = nil flash[:error] = "Please sign in to facebook (#{exc.to_s})" - redirect_to "/" + reset_session + redirect_to "/zack/sign_out" + return false rescue Exception => exc2 @user = nil flash[:error] = "Error: #{exc2.to_s}" - redirect_to "/" + reset_session + redirect_to "/zack/sign_out" + return false end + return true end end app/controllers/application.rb @@ -1,7 +1,7 @@ class ZackController < ApplicationController include ActorRole - before_filter :load_data + before_filter :load_data, :except => :roles before_filter :require_facebook_user, :only => [:choose_role, :save_role, :send_email, :action_success] def index @@ -43,10 +43,18 @@ class ZackController < ApplicationController def action_success end + + def roles + @center_layout = false + @roles = Role.find(:all, :limit => 100, :order => "created_at desc") + @roles_count = Role.count + end protected def load_data - @roles = Role.find(:all, :limit => 100, :order => "created_at desc") + @center_layout = true + @footer_roles = @roles = Role.find(:all, :limit => 10, :order => "created_at desc") + @roles_count = Role.count end end app/controllers/zack_controller.rb @@ -14,12 +14,16 @@ Zack N Miri - share your interest using Facebook Connect .content_seperator - .main_content - .widget_content - = @content_for_layout + - if @center_layout + .main_content + .widget_content + = @content_for_layout + - else + = @content_for_layout - .content_seperator - = render :partial => 'roles' + - if @footer_roles + .content_seperator + = render :partial => 'roles' .content_seperator = render :partial => '/zack/footer' = render :partial => '/zack/js_constants' app/views/layouts/zack.haml @@ -1,5 +1,8 @@ +- @roles ||= [] - for role in @roles .role %fb:profile-pic{:uid=>role.uid, :linked=>"true"} %br = h role.text +.clearing += link_to "See all #{@roles_count}", :controller => "zack", :action => "roles" \ No newline at end of file app/views/zack/_roles.haml @@ -69,7 +69,8 @@ end ENV['XD_RECEIVER_LOCATION'] = "/zack/connect/xd_receiver.htm" ENV['FACEBOOK_AUTHENTICATE_LOCATION'] = "/zack/authenticate" -ENV['FACEBOOK_SIGNED_IN_URL'] = "/zack/choose_role" +#the js redirects to this url when signed in, it must set up the facebook session +ENV['FACEBOOK_SIGNED_IN_URL'] = "/zack/authenticate" #File: lib/extensions.rb module Facebooker config/environment.rb 4653c6fef38a39b6241bba926184ef58ea402ebe Chris Hobbs chris@spongecell.com http://github.com/ckhsponge/zacknmiri/commit/4688c907e1e4f44ed5e8e38e8fa605dc08690d89 4688c907e1e4f44ed5e8e38e8fa605dc08690d89 2008-12-11T16:58:40-08:00 2008-12-11T16:58:40-08:00 limit roles, fixed js infinte loop 3f6c4d6dbf14bdbc693b1194c407c6dff2328a47 Chris Hobbs chris@spongecell.com