Permalink
Browse files

Merge branch 'master' into ideal

  • Loading branch information...
2 parents 2ad0987 + c96fcd2 commit 2f9b53a7c7bbc87b9c1ae2841de319572ce1912a Jacqui Maher and Veez (Matt Remsik) committed with veezus Mar 9, 2009
@@ -70,6 +70,7 @@ def fact_checkers_for(pitch)
applicants = [['No applicants', '']] if applicants.empty?
output += content_tag('optgroup', options_for_select(applicants), :label => 'Pitch Applicants')
output += content_tag('optgroup', options_for_select(User.fact_checkers.map{|u| [u.full_name, u.id]}), :label => 'General Interest')
+ output += content_tag('optgroup', options_for_select(User.all.map{|u| [u.full_name, u.id]}), :label => 'All Users')
output
end
@@ -342,7 +342,8 @@
The end content produced by Spot.Us will be given away for free unless a news organization has
contributed either 50% or 100% of the total cost. In that situation - we will grant that
news organization temporary copyright to the article. Eventually all Spot.Us stories are licensed
- under Creative Commons. You can learn more by reading our = link_to 'Reporters Contract', page_path("reporter_contract")
+ under Creative Commons. You can learn more by reading our
+ = link_to 'Reporters Contract', page_path("reporter_contract")
.block-spacer
.box_white{:style => "width: 66%;"}
@@ -64,7 +64,7 @@
= image_tag "http://spotreporting.files.wordpress.com/2008/11/picture-1.png"
%p
%li
- == #{link_to "The Big Digital News of Today: Spot.us Launches", "http://spj.org/blog/blogs/tech/archive/2008/11/10/21637.aspx"} - Society of Profesional Journalists
+ == #{link_to "The Big Digital News of Today: Spot.us Launches", "http://spj.org/blog/blogs/tech/archive/2008/11/10/21637.aspx"} - Society of Professional Journalists
= image_tag "http://www.spj.org/spjhead.gif"
%p
%li
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -132,8 +132,10 @@
fact_checkers.should have_tag('option[value=?]', user.id)
end
end
- it "should not include users otherwise" do
- fact_checkers_for(@pitch).should_not have_tag('option[value=?]', @uninterested_users.first.id)
+ it "should include all other users in a third group" do
+ fact_checkers_for(@pitch).should have_tag('optgroup[label=?]', 'All Users') do
+ with_tag('option[value=?]', @uninterested_users.first.id)
+ end
end
it "should display 'No applicants' when nobody has applied to fact-check a pitch" do
@pitch.stub!(:fact_checker_applicants).and_return([])

0 comments on commit 2f9b53a

Please sign in to comment.