gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge with master

Browse source
This commit is contained in:
Chrisbr 2014-05-12 15:26:46 +02:00
parent d97e3603b1
commit 9e831cb514
2 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -76,12 +76,9 @@ group :development, :test do
gem 'rspec', '>= 3.0.0.beta' gem 'rspec', '>= 3.0.0.beta'
gem 'rspec-rails', '>= 3.0.0.beta' gem 'rspec-rails', '>= 3.0.0.beta'
gem 'capybara' gem 'capybara'
<<<<<<< HEAD
gem 'database_cleaner' gem 'database_cleaner'
gem 'capybara-webkit' gem 'capybara-webkit'
=======
gem 'shoulda' gem 'shoulda'
>>>>>>> 374efd311fb7f82d0e8257a62675a663904708d5
end end
# FIXME: We should use http://weblog.rubyonrails.org/2012/3/21/strong-parameters/ # FIXME: We should use http://weblog.rubyonrails.org/2012/3/21/strong-parameters/

8
app/controllers/admin/conference_controller.rb
View file

@ -15,13 +15,6 @@ class Admin::ConferenceController < ApplicationController
def create def create
@conference = Conference.new(params[:conference]) @conference = Conference.new(params[:conference])
<<<<<<< HEAD
if @conference.save
redirect_to(admin_conference_path(id: @conference.short_title),
notice: 'Conference was successfully created.')
else
render action: 'new'
=======
if @conference.valid? if @conference.valid?
@conference.save @conference.save
redirect_to(admin_conference_path(id: @conference.short_title), redirect_to(admin_conference_path(id: @conference.short_title),
@ -29,7 +22,6 @@ class Admin::ConferenceController < ApplicationController
else else
redirect_to(new_admin_conference_path, redirect_to(new_admin_conference_path,
flash: { error: @conference.errors.full_messages.join('! ') }) flash: { error: @conference.errors.full_messages.join('! ') })
>>>>>>> 374efd311fb7f82d0e8257a62675a663904708d5
end end
end end