app/models/role.rb app/views/layouts/home.html.erb app/views/layouts/schedule.html.erb db/migrate/20091019234058_create_roles.rb test/fixtures/roles.yml test/unit/role_test.rb @@ -6,7 +6,7 @@ class ApplicationController < ActionController::Base protect_from_forgery # See ActionController::RequestForgeryProtection for details\ filter_parameter_logging :password before_filter :set_current_event - helper_method :current_event, :admin?, :current_user + helper_method :current_event, :current_user, :is_admin? def current_event set_current_event @@ -14,18 +14,16 @@ class ApplicationController < ActionController::Base protected - def authorize - unless admin? - flash[:error] = "unauthorized access" - redirect_to '/login' - false + def is_admin? + if current_user && current_event + current_event.admins.find current_user + else + flash[:error] = "unauthorized access" + redirect_to login_path + false end end - def admin? - session[:password] == 'hcb0s' - end - def is_iphone? request.user_agent =~ /(Mobile\/.+Safari)/ end @@ -38,7 +36,7 @@ class ApplicationController < ActionController::Base private def set_current_event - @current_event ||= Event.find_by_short_name!(request.subdomains.last) + @current_event ||= Event.find_by_short_name(request.subdomains.last) end def current_user_session app/controllers/application_controller.rb @@ -1,5 +1,6 @@ class HomeController < ApplicationController skip_before_filter :set_current_event + def index end app/controllers/home_controller.rb @@ -21,7 +21,7 @@ class PresentationsController < ApplicationController @comment = Comment.new respond_to do |format| - format.html { render :layout=>"application" }# show.html.erb + format.html { render :layout=>"schedule" }# show.html.erb format.xml { render :xml => @presentation } end end app/controllers/presentations_controller.rb @@ -1,5 +1,6 @@ class ScheduleController < ApplicationController - before_filter :is_iphone?, :authorize, :only => :admin + before_filter :is_iphone? + before_filter :is_admin?, :only => :admin before_filter :setup_selected_day def setup_selected_day app/controllers/schedule_controller.rb @@ -1,4 +1,5 @@ class UserSessionsController < ApplicationController + def new @user_session = UserSession.new end app/controllers/user_sessions_controller.rb @@ -2,7 +2,10 @@ class Event < ActiveRecord::Base has_many :timeslots has_many :rooms has_many :presentations - + has_many :roles + has_many :users, :through => :roles + has_many :admins, :through => :roles, :source => :user, :conditions => "role_type = '#{Role::TYPE_ADMIN}'" + def schedule(selected_day = nil) slots = [] if selected_day app/models/event.rb @@ -1,3 +1,5 @@ class User < ActiveRecord::Base acts_as_authentic + has_many :roles + has_many :events, :through => :roles end app/models/user.rb @@ -1,3 +1,7 @@ +<% content_for :title do %> + <%= current_event.name %> +<% end %> + <table class="schedule" cellspacing="0" width="100%"> <%=render :partial=>current_event.rotation_columns%> <% render :layout =>current_event.rotation_rows do %> app/views/schedule/index.html.erb @@ -5,13 +5,14 @@ ActionController::Routing::Routes.draw do |map| map.resources :presentations map.resources :timeslots map.resources :rooms - map.home '', :controller => 'schedule', :action => 'index' map.login 'login', :controller => 'user_sessions', :action => 'new' map.logout 'logout', :controller => 'user_sessions', :action => 'destroy' map.iphone 'iphone', :controller=>'schedule', :action=>'iphone' map.mobile 'mobile', :controller=>'schedule', :action=>'mobile' - map.root :controller => 'schedule', :conditions => { :subdomain => /.+/ } - map.root :controller => 'home', :conditions => { :subdomain => 'www' } + map.home '', :controller => 'home', :action => 'index', :conditions=>{:subdomain=>'www'} + map.home '', :controller => 'schedule', :action => 'index' + map.root :controller => 'home', :action => 'index', :conditions=>{:subdomain=>'www'} + map.root :controller => 'schedule' map.connect ':controller/:action/:id' map.connect ':controller/:action/:id.:format' end config/routes.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20091017152052) do +ActiveRecord::Schema.define(:version => 20091019234058) do create_table "comments", :force => true do |t| t.integer "presentation_id" @@ -48,6 +48,14 @@ ActiveRecord::Schema.define(:version => 20091017152052) do add_index "presentations", ["room_id", "timeslot_id"], :name => "index_presentations_on_room_id_and_timeslot_id", :unique => true + create_table "roles", :force => true do |t| + t.integer "user_id" + t.integer "event_id" + t.string "role_type" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "rooms", :force => true do |t| t.string "name" t.string "location" db/schema.rb app/views/layouts/application.html.erb ab2853b506a7f958ed053b849673442ead64c3c1 Carl Leiby carl.leiby@gmail.com http://github.com/carlism/barcamp_schedule/commit/52717b022fdb58180f00e578511deae9b584b7d8 52717b022fdb58180f00e578511deae9b584b7d8 2009-10-19T17:51:12-07:00 2009-10-19T17:51:12-07:00 Added roles and got the routes file working for the www domain 1b666f1bf2704d9b3c953f73fdd903d6f3035782 Carl Leiby carl.leiby@gmail.com