Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-03 03:20:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

some smallfurther adjustments

Browse source
This commit is contained in:
Reinier Balt 2011-09-28 15:34:15 +02:00
parent 3a07010338
commit 2f0bfbbf47
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/projects_controller.rb
View file

@ -40,7 +40,7 @@ class ProjectsController < ApplicationController
@projects_to_review = current_user.projects.select {|p| p.needs_review?(current_user)} @projects_to_review = current_user.projects.select {|p| p.needs_review?(current_user)}
@stalled_projects = current_user.projects.select {|p| p.stalled?} @stalled_projects = current_user.projects.select {|p| p.stalled?}
@blocked_projects = current_user.projects.select {|p| p.blocked?} @blocked_projects = current_user.projects.select {|p| p.blocked?}
@current_projects = current_user.projects.select {|p| not(p.needs_review?(current_user))} @current_projects = current_user.projects.uncompleted.select {|p| not(p.needs_review?(current_user))}
init_not_done_counts(['project']) init_not_done_counts(['project'])
init_project_hidden_todo_counts(['project']) init_project_hidden_todo_counts(['project'])

6
app/models/project.rb
View file

@ -115,14 +115,14 @@ class Project < ActiveRecord::Base
def blocked? def blocked?
## mutually exclusive for stalled and blocked ## mutually exclusive for stalled and blocked
# blocked is uncompleted project with deferred or pending todos, but no next actions # blocked is uncompleted project with deferred or pending todos, but no next actions
return false if self.stalled? || self.completed? return false if self.completed?
return !self.todos.deferred_or_blocked.empty? return !self.todos.deferred_or_blocked.empty? && self.todos.not_deferred_or_blocked.empty?
end end
def stalled? def stalled?
# stalled is active/hidden project with no active todos # stalled is active/hidden project with no active todos
return false if self.completed? return false if self.completed?
return self.todos.not_completed.empty? return self.todos.deferred_or_blocked.empty? && self.todos.not_deferred_or_blocked.empty?
end end

2
app/views/projects/_project_form.rhtml
View file

@ -40,7 +40,7 @@ project = project_form
<%=image_tag("cancel.png", :alt => "") %> <%=image_tag("cancel.png", :alt => "") %>
Cancel Cancel
</a> </a>
<a href="/projects/<%=project.id.to_s+"/set_reviewed"%>" id="<%= dom_id(project, 'reviewed') %>" class="reviewed"> <a href="<%=set_reviewed_project_path(project)%>" id="<%= dom_id(project, 'reviewed') %>" class="reviewed">
<%=image_tag("reviewed.png", :alt => "") %> <%=image_tag("reviewed.png", :alt => "") %>
Reviewed Reviewed
</a> </a>

2
config/routes.rb
View file

@ -14,7 +14,7 @@ ActionController::Routing::Routes.draw do |map|
map.resources :projects, map.resources :projects,
:collection => {:order => :post, :alphabetize => :post, :actionize => :post, :done => :get}, :collection => {:order => :post, :alphabetize => :post, :actionize => :post, :done => :get},
:member => {:done_todos => :get, :all_done_todos => :get, :set_reviewed => :post} do |projects| :member => {:done_todos => :get, :all_done_todos => :get, :set_reviewed => :get} do |projects|
projects.resources :todos, :name_prefix => "project_" projects.resources :todos, :name_prefix => "project_"
end end