Merge pull request #205 from mmozuras/refactor_negative_blanks_into_presents

Refactor negative blanks into presents
This commit is contained in:
Reinier Balt 2013-09-13 05:56:03 -07:00
commit 35d0afdfdf
6 changed files with 12 additions and 12 deletions

View file

@ -91,7 +91,7 @@ class TodosController < ApplicationController
if @todo.errors.empty?
@todo.add_predecessor_list(p.predecessor_list)
@saved = @todo.save
@todo.tag_with(tag_list) if @saved && !tag_list.blank?
@todo.tag_with(tag_list) if @saved && tag_list.present?
@todo.update_state_from_project if @saved
@todo.block! if @todo.should_be_blocked?
else
@ -174,8 +174,8 @@ class TodosController < ApplicationController
todo.add_predecessor(@predecessor)
todo.block!
end
todo.tag_with(tag_list) unless (@saved == false) || tag_list.blank?
todo.tag_with(tag_list) if @saved && tag_list.present?
@todos << todo
@not_done_todos << todo if p.new_context_created || p.new_project_created
@ -1162,7 +1162,7 @@ end
def update_context
@context_changed = false
if params['todo']['context_id'].blank? && !params['context_name'].blank?
if params['todo']['context_id'].blank? && params['context_name'].present?
context = current_user.contexts.where(:name => params['context_name'].strip).first
unless context
@new_context = current_user.contexts.build