Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-06 07:51:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #205 from mmozuras/refactor_negative_blanks_into_presents

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/preferences_controller.rb
View file

@ -12,7 +12,7 @@ class PreferencesController < ApplicationController
user_updated = current_user.update_attributes(user_params)
prefs_updated = current_user.preference.update_attributes(prefs_params)
if (user_updated && prefs_updated)
if !params['user']['password'].blank? # password updated?
if params['user']['password'].present? # password updated?
logout_user t('preferences.password_changed')
else
preference_updated

2
app/controllers/recurring_todos_controller.rb
View file

@ -72,7 +72,7 @@ class RecurringTodosController < ApplicationController
end
# update context
if params['recurring_todo']['context_id'].blank? && !params['context_name'].blank?
if params['recurring_todo']['context_id'].blank? && params['context_name'].present?
context = current_user.contexts.where(:name => params['context_name'].strip).first
unless context
context = current_user.contexts.build

4
app/controllers/todos/todo_create_params_helper.rb
View file

@ -89,7 +89,7 @@ module Todos
end
def sequential?
return !@params[:todos_sequential].blank? && @params[:todos_sequential]=='true'
return @params[:todos_sequential].present? && @params[:todos_sequential]=='true'
end
def specified_by_name?(group_type)
@ -98,7 +98,7 @@ module Todos
def specified_by_id?(group_type)
group_id = send("#{group_type}_id")
!group_id.blank?
group_id.present?
end
def project_specified_by_name?

8
app/controllers/todos_controller.rb
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