Put current conference in url #14

Merged
AndrewRadev merged 4 commits from conference-slug-in-url into 2.0 2015-07-12 11:32:03 +03:00
9 changed files with 35 additions and 42 deletions
Showing only changes of commit df682e65e5 - Show all commits

View File

@ -1,21 +1,13 @@
module Management
class CallForParticipationsController < ManagementController
before_action :assign_conference
def create
@conference.call_for_participation.open!
current_conference.call_for_participation.open!
render :redraw
end
def destroy
@conference.call_for_participation.close!
current_conference.call_for_participation.close!
render :redraw
end
private
def assign_conference
@conference = Conference.find params[:conference_id]
end
end
end

View File

@ -10,8 +10,7 @@ module Management
@conference = Conference.new(conference_params)
if @conference.save
set_current_conference(@conference)
redirect_to [:management, @conference]
redirect_to management_conference_path(@conference, current_conference: @conference.slug)
else
render :new
end
@ -39,9 +38,8 @@ module Management
def destroy
@conference = find_conference
@conference.destroy
set_current_conference(nil)
redirect_to management_root_path
redirect_to management_root_path(current_conference: nil)
end
private

View File

@ -5,9 +5,7 @@ module Management
def set_conference
conference = Conference.find(params[:id])
set_current_conference(conference)
redirect_to [:management, conference]
redirect_to management_conference_path(conference, current_conference: conference.slug)
end
end
end

View File

@ -15,29 +15,16 @@ module Management
end
helper_method :current_conference?
# TODO (2015-06-09) Fetch conferences by slug only
def current_conference
@current_conference ||=
begin
# if params[:current_conference]
# Conference.find_by_slug(params[:current_conference])
# end
if session[:current_conference_id]
Conference.find_by(id: session[:current_conference_id])
if params[:current_conference]
Conference.find_by_slug(params[:current_conference])
end
end
end
helper_method :current_conference
def set_current_conference(conference)
if conference.present?
session[:current_conference_id] = conference.id
else
session.delete(:current_conference_id)
end
end
def authorize_user!
head :forbidden unless current_user.admin?
end

View File

@ -16,6 +16,7 @@ class Conference < ActiveRecord::Base
accepts_nested_attributes_for :tracks, :halls, reject_if: :all_blank, allow_destroy: true
before_create :slugify_title
after_create :create_call_for_participation
def submissions_grouped_by_day
@ -28,15 +29,13 @@ class Conference < ActiveRecord::Base
submissions.group_by { |s| s.confirmed_at.to_date }
end
def slug
title.gsub(' ', '-')
def self.find_by_slug(slug)
find_by(slug: slug)
end
# TODO (2015-06-09) Stupid and temporary, put slug in db
# TODO (2015-06-09) Also, doesn't work due to translations?
# def self.find_by_slug(slug)
# find_by(title: slug.to_s.gsub('-', ' '))
# end
def slugify_title
self.slug = title.gsub(/\s+/, '-')
end
private

View File

@ -0,0 +1,6 @@
class AddSlugToConferences < ActiveRecord::Migration
def change
add_column :conferences, :slug, :string
add_index :conferences, :slug
end
end

View File

@ -0,0 +1,13 @@
class CreateSlugsForExistingConferences < ActiveRecord::Migration
class Conference < ActiveRecord::Base
end
def change
Globalize.with_locale(:en) do
Conference.find_each do |c|
c.slug = c.title.gsub(/\s+/, '-')
c.save!
end
end
end
end

View File

@ -8,7 +8,7 @@ RSpec.describe Management::CallForParticipationsController, type: :controller do
describe 'POST #create' do
it 'opens the CFP of the specified conference' do
expect do
post 'create', conference_id: conference.id, format: :js
post 'create', current_conference: conference.slug, format: :js
end.to change { Conference.find(conference.id).call_for_participation.in_progress? }.from(false).to(true)
end
end
@ -18,7 +18,7 @@ RSpec.describe Management::CallForParticipationsController, type: :controller do
conference.call_for_participation.open!
expect do
delete 'destroy', conference_id: conference.id, format: :js
delete 'destroy', current_conference: conference.slug, format: :js
end.to change { Conference.find(conference.id).call_for_participation.in_progress? }.from(true).to(false)
end
end

View File

@ -2,7 +2,7 @@
FactoryGirl.define do
factory :conference do
title { |n| "Conference-#{n}" }
sequence(:title) { |n| "Conference-#{n}" }
email
description 'MyText'
start_date '2014-07-29 21:29:13'