@@ -73,7 +73,6 @@ class Admin::Con::CfpController < ApplicationController respond_to do |format| if @submission.update_attributes(params[:submission]) - @submission.presentation.save flash[:notice] = 'Presentation was successfully updated.' format.html { redirect_to :action => :index } format.xml { head :ok } app/controllers/admin/con/cfp_controller.rb @@ -1,11 +1,11 @@ class Admin::Con::SpeakersController < Admin::Con::CurrentConferenceController active_scaffold :user do | config | - config.columns.exclude :login, :password, :admin, :developer, :salt, :lock_versino + config.columns.exclude :login, :password, :admin, :developer, :salt, :lock_version config.list.columns = [:name, :email] - config.update.columns = [:name, :email, :url, :photo, :notes] - config.create.columns = [:name, :email, :url, :photo, :notes] - config.show.columns = [:name, :email, :url, :photo, :notes] + config.update.columns = [:name, :email, :url, :photo, :login, :password, :password_confirmation, :notes] + config.create.columns = [:name, :email, :url, :photo, :login, :password, :password_confirmation, :notes ] + config.show.columns = [:name, :email, :url, :photo, :login, :notes] end def conditions_for_collection app/controllers/admin/con/speakers_controller.rb @@ -2,8 +2,8 @@ class Admin::Con::SubmissionsController < Admin::Con::CurrentConferenceControlle active_scaffold :submissions do | config | config.list.columns = [:presentation, :presenter, :scheduled_sessions, :accepted] - config.create.columns = [:presentation, :accepted, :votes, :score, :panel_members, :conference] - config.update.columns = [:presentation, :accepted, :votes, :score, :panel_members, :scheduled_sessions, :conference] + config.create.columns = [:presentation, :accepted, :votes, :score, :panel_members, :conference] + config.update.columns = [:presentation, :scheduled_sessions, :panel_members, :accepted, :votes, :score] config.show.columns = [:presentation, :accepted, :votes, :score, :panel_members, :scheduled_sessions, :conference] config.subform.columns = [:presentation, :conference] app/controllers/admin/con/submissions_controller.rb @@ -3,11 +3,11 @@ class Admin::Con::UsersController < ApplicationController layout "configuration" active_scaffold :user do | config | - config.columns.exclude :login, :password, :admin, :developer, :salt, :lock_versino + config.columns.exclude :login, :password, :admin, :developer, :salt, :lock_version config.list.columns = [:name, :email] - config.update.columns = [:name, :email, :url, :photo, :notes] - config.create.columns = [:name, :email, :url, :photo, :notes] - config.show.columns = [:name, :email, :url, :photo, :notes, :conference_roles, :presentations, :submissions] + config.update.columns = [:name, :email, :url, :photo, :login, :password, :password_confirmation, :notes] + config.create.columns = [:name, :email, :url, :photo, :login, :password, :password_confirmation, :notes] + config.show.columns = [:name, :login, :email, :url, :photo, :notes, :conference_roles] end end app/controllers/admin/con/users_controller.rb @@ -4,9 +4,11 @@ class PanelMember < ActiveRecord::Base belongs_to :presenter, :class_name => "User", :foreign_key => "presenter_id" belongs_to :submission + + validates_presence_of :submission, :presenter def to_label - "#{self.presenter.name} on #{self.submission.presentation.name}" + "#{self.presenter.name} on #{self.submission ? self.submission.name : '*MISSING SUBMISSION*'}" end end app/models/panel_member.rb app/controllers/admin/con/#cfp_controller.rb# app/controllers/admin/con/.#cfp_controller.rb ed2fea7dcfc80d235bb09d464dbdfcf154e6c654 J Aaron Farr farra@apache.org http://github.com/farra/radiant-conferences-extensions/commit/eff227fb7576c6b7bd86fc247e9e588e74192e76 eff227fb7576c6b7bd86fc247e9e588e74192e76 2008-09-25T21:23:23-07:00 2008-09-25T21:23:23-07:00 allowing users to properly be edited in the user controller and submissions edited in the submission controller. f53030b780dd531233e436444df02cedd96668b7 J Aaron Farr farra@apache.org