indent using spaces
This commit is contained in:
parent
b1fac33420
commit
ae1f292719
4 changed files with 41 additions and 43 deletions
|
|
@ -1,41 +1,40 @@
|
|||
class OrganizationsController < ApplicationController
|
||||
load_and_authorize_resource :organization
|
||||
load_and_authorize_resource :organization
|
||||
|
||||
def index
|
||||
@organizations = Organization.all
|
||||
end
|
||||
def index
|
||||
@organizations = Organization.all
|
||||
end
|
||||
|
||||
def create
|
||||
@organization = Organization.new(organization_params)
|
||||
if @organization.save
|
||||
redirect_to organizations_path,
|
||||
notice: 'Organization successfully created'
|
||||
else
|
||||
redirect_to new_organization_path,
|
||||
error: @organization.errors.full_messages.join(', ')
|
||||
end
|
||||
end
|
||||
def create
|
||||
@organization = Organization.new(organization_params)
|
||||
if @organization.save
|
||||
redirect_to organizations_path,
|
||||
notice: 'Organization successfully created'
|
||||
else
|
||||
redirect_to new_organization_path,
|
||||
error: @organization.errors.full_messages.join(', ')
|
||||
end
|
||||
end
|
||||
|
||||
def new
|
||||
@organization = Organization.new
|
||||
end
|
||||
def new
|
||||
@organization = Organization.new
|
||||
end
|
||||
|
||||
def edit
|
||||
end
|
||||
def edit; end
|
||||
|
||||
def update
|
||||
if @organization.update_attributes(organization_params)
|
||||
redirect_to organizations_path,
|
||||
notice: 'Organization successfully updated'
|
||||
else
|
||||
redirect_to edit_organization_path(@organization),
|
||||
error: @organization.errors.full_messages.join(', ')
|
||||
end
|
||||
end
|
||||
def update
|
||||
if @organization.update_attributes(organization_params)
|
||||
redirect_to organizations_path,
|
||||
notice: 'Organization successfully updated'
|
||||
else
|
||||
redirect_to edit_organization_path(@organization),
|
||||
error: @organization.errors.full_messages.join(', ')
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
private
|
||||
|
||||
def organization_params
|
||||
params.require(:organization).permit(:name, :description, :picture)
|
||||
end
|
||||
def organization_params
|
||||
params.require(:organization).permit(:name, :description, :picture)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@ class Organization < ActiveRecord::Base
|
|||
validates :name, presence: true
|
||||
|
||||
mount_uploader :picture, PictureUploader, mount_on: :picture
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
FactoryGirl.define do
|
||||
factory :organization do
|
||||
name { Faker::Company.name }
|
||||
description { Faker::Lorem.paragraph }
|
||||
name { Faker::Company.name }
|
||||
description { Faker::Lorem.paragraph }
|
||||
|
||||
# after(:create) do |organization|
|
||||
# File.open("spec/support/logos/#{1 + rand(13)}.png") do |file|
|
||||
# organization.picture = file
|
||||
# end
|
||||
# organization.save!
|
||||
# end
|
||||
# after(:create) do |organization|
|
||||
# File.open("spec/support/logos/#{1 + rand(13)}.png") do |file|
|
||||
# organization.picture = file
|
||||
# end
|
||||
# organization.save!
|
||||
# end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ describe Organization do
|
|||
|
||||
describe 'validation' do
|
||||
it 'has a valid factory' do
|
||||
expect( build(:organization) ).to be_valid
|
||||
expect(build(:organization)).to be_valid
|
||||
end
|
||||
|
||||
it 'is not valid without a name' do
|
||||
|
|
@ -17,4 +17,3 @@ describe Organization do
|
|||
it { should have_many(:conferences).dependent(:destroy) }
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue