Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-21 17:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

empty non-saved project caused rss builder to fail

Browse source
This commit is contained in:
Reinier Balt 2013-05-13 12:50:10 +02:00
parent 54b106d96b
commit 80974fb0d5
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/projects_controller.rb
View file

@ -20,7 +20,6 @@ class ProjectsController < ApplicationController
else else
@projects = current_user.projects @projects = current_user.projects
end end
@new_project = current_user.projects.build
@active_projects = current_user.projects.active @active_projects = current_user.projects.active
@hidden_projects = current_user.projects.hidden @hidden_projects = current_user.projects.hidden
respond_to do |format| respond_to do |format|
@ -31,6 +30,7 @@ class ProjectsController < ApplicationController
@completed_count = current_user.projects.completed.count @completed_count = current_user.projects.completed.count
@no_projects = current_user.projects.empty? @no_projects = current_user.projects.empty?
current_user.projects.cache_note_counts current_user.projects.cache_note_counts
@new_project = current_user.projects.build
end end
format.m do format.m do
@completed_projects = current_user.projects.completed @completed_projects = current_user.projects.completed

2
app/views/projects/index.rss.builder
View file

@ -11,7 +11,7 @@ xml.rss :version => "2.0" do
xml.item do xml.item do
xml.title h(project.name) xml.title h(project.name)
xml.description project_summary(project) xml.description project_summary(project)
xml.pubDate project.created_at.to_s(:rfc822) xml.pubDate project.created_at.rfc822
xml.link project_url(project) xml.link project_url(project)
xml.guid project_url(project) xml.guid project_url(project)
end end

4
test/controllers/projects_controller_test.rb
View file

@ -44,7 +44,7 @@ class ProjectsControllerTest < ActionController::TestCase
def test_todo_state_is_project_hidden_after_hiding_project def test_todo_state_is_project_hidden_after_hiding_project
p = projects(:timemachine) p = projects(:timemachine)
todos = p.todos.find_in_state(:all, :active) todos = p.todos.active
login_as(:admin_user) login_as(:admin_user)
xhr :post, :update, :id => 1, "project"=>{"name"=>p.name, "description"=>p.description, "state"=>"hidden"} xhr :post, :update, :id => 1, "project"=>{"name"=>p.name, "description"=>p.description, "state"=>"hidden"}
todos.each do |t| todos.each do |t|
@ -55,7 +55,7 @@ class ProjectsControllerTest < ActionController::TestCase
def test_not_done_counts_after_hiding_and_unhiding_project def test_not_done_counts_after_hiding_and_unhiding_project
p = projects(:timemachine) p = projects(:timemachine)
todos = p.todos.find_in_state(:all, :active) todos = p.todos.active
login_as(:admin_user) login_as(:admin_user)
xhr :post, :update, :id => 1, "project"=>{"name"=>p.name, "description"=>p.description, "state"=>"hidden"} xhr :post, :update, :id => 1, "project"=>{"name"=>p.name, "description"=>p.description, "state"=>"hidden"}
xhr :post, :update, :id => 1, "project"=>{"name"=>p.name, "description"=>p.description, "state"=>"active"} xhr :post, :update, :id => 1, "project"=>{"name"=>p.name, "description"=>p.description, "state"=>"active"}