From ceae8e0204a8fc37d1a92a308c1e8f7b3ca0477a Mon Sep 17 00:00:00 2001 From: GIT_AUTHOR_NAME Date: Fri, 18 Sep 2009 12:57:16 -0700 Subject: [PATCH] Organizations can now pitch --- app/controllers/homes_controller.rb | 2 +- app/models/pitch.rb | 2 +- config/environment.rb | 1 + .../20090219203016_load_display_name_for_default_network.rb | 1 + spec/models/pitch_spec.rb | 4 ++++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/homes_controller.rb b/app/controllers/homes_controller.rb index 040bd63f6..4501283a6 100644 --- a/app/controllers/homes_controller.rb +++ b/app/controllers/homes_controller.rb @@ -9,7 +9,7 @@ def start_story if !logged_in? session[:return_to] = start_story_path redirect_to new_session_path - elsif logged_in? && current_user.is_a?(Reporter) + elsif logged_in? && current_user.is_a?(Reporter) || current_user.is_a?(Organization) redirect_to new_pitch_path else redirect_to new_tip_path diff --git a/app/models/pitch.rb b/app/models/pitch.rb index a683278d7..c60423ccc 100644 --- a/app/models/pitch.rb +++ b/app/models/pitch.rb @@ -170,7 +170,7 @@ def self.with_sort(sort='desc') end def self.createable_by?(user) - user && user.reporter? + user && user.reporter? || user.organization? end def featured? diff --git a/config/environment.rb b/config/environment.rb index 44184bc8f..0297a9a58 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -22,6 +22,7 @@ config.gem "rubyist-aasm", :lib => "aasm", :version => '>=2.0.5', :source => 'http://gems.github.com' config.gem 'mislav-will_paginate', :lib => 'will_paginate', :version => '>=2.3.7', :source => 'http://gems.github.com/' config.gem "rspec-rails", :lib => false, :version => "= 1.2.2" + config.gem "rspec", :lib => false, :version => "= 1.2.2" config.gem "cucumber", :lib => false, :version => "= 0.1.16" config.gem "webrat", :lib => false, :version => ">= 0.4.4" config.gem "money", :version => ">=2.1.3" diff --git a/db/migrate/20090219203016_load_display_name_for_default_network.rb b/db/migrate/20090219203016_load_display_name_for_default_network.rb index 5cc5371c1..a876b26b7 100644 --- a/db/migrate/20090219203016_load_display_name_for_default_network.rb +++ b/db/migrate/20090219203016_load_display_name_for_default_network.rb @@ -1,5 +1,6 @@ class LoadDisplayNameForDefaultNetwork < ActiveRecord::Migration def self.up + #Network.reset_column_information Network.create!(:name => 'sfbay', :display_name => 'Bay Area') end diff --git a/spec/models/pitch_spec.rb b/spec/models/pitch_spec.rb index 8a43e5ea3..ece2c70a8 100644 --- a/spec/models/pitch_spec.rb +++ b/spec/models/pitch_spec.rb @@ -508,6 +508,10 @@ it "is creatable by reporter" do Pitch.createable_by?(Factory(:reporter)).should be end + + it "is creatable by organization" do + Pitch.createable_by?(Factory(:organization)).should be + end it "is not creatable by user" do Pitch.createable_by?(Factory(:user)).should_not be_true