Skip to content

Commit

Permalink
coding standards cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
speedy32129 committed Jul 1, 2016
1 parent bb5ce66 commit 54f8aaa
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
8 changes: 4 additions & 4 deletions app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def status_from_id(status_id)
IssueStatus.find_by_id(status_id)
end

def statuses_list()
def statuses_list
IssueStatus.all
end

Expand All @@ -26,7 +26,7 @@ def to_status_options(statuses)

def new_transition_from_options(transitions)
statuses = []
for status in statuses_list()
for status in statuses_list
statuses << status unless transitions.has_key?(status.id.to_s)
#if !transitions.has_key?(status.id.to_s)
# statuses << status
Expand All @@ -35,8 +35,8 @@ def new_transition_from_options(transitions)
to_status_options(statuses)
end

def new_transition_to_options()
to_status_options(statuses_list())
def new_transition_to_options
to_status_options(statuses_list)
end

def global_allowed_to?(user, action)
Expand Down
42 changes: 21 additions & 21 deletions config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
if Rails::VERSION::MAJOR >= 4
Rails.application.routes.draw do
match 'time_loggers/stop', :to => "time_loggers#stop", via: [:get, :post]
match 'time_loggers/start', :to => "time_loggers#start", via: [:get, :post]
match 'time_loggers/suspend', :to => "time_loggers#suspend", via: [:get, :post]
match 'time_loggers/resume', :to => "time_loggers#resume", via: [:get, :post]
match 'time_loggers/render_menu', :to => "time_loggers#render_menu", via: [:get, :post]
match 'time_loggers/add_status_transition', :to => "time_loggers#add_status_transition", via: [:get, :post]
match 'time_loggers/delete_status_transition', :to => "time_loggers#delete_status_transition", via: [:get, :post]
match 'time_loggers/show_report', :to => "time_loggers#show_report", via: [:get, :post]
match 'time_loggers/delete', :to => "time_loggers#delete", via: [:get, :post]
match 'time_loggers', :to => "time_loggers#index", via: [:get, :post]
match 'time_loggers/stop', :to => 'time_loggers#stop', via: [:get, :post]
match 'time_loggers/start', :to => 'time_loggers#start', via: [:get, :post]
match 'time_loggers/suspend', :to => 'time_loggers#suspend', via: [:get, :post]
match 'time_loggers/resume', :to => 'time_loggers#resume', via: [:get, :post]
match 'time_loggers/render_menu', :to => 'time_loggers#render_menu', via: [:get, :post]
match 'time_loggers/add_status_transition', :to => 'time_loggers#add_status_transition', via: [:get, :post]
match 'time_loggers/delete_status_transition', :to => 'time_loggers#delete_status_transition', via: [:get, :post]
match 'time_loggers/show_report', :to => 'time_loggers#show_report', via: [:get, :post]
match 'time_loggers/delete', :to => 'time_loggers#delete', via: [:get, :post]
match 'time_loggers', :to => 'time_loggers#index', via: [:get, :post]
end
elsif Rails::VERSION::MAJOR = 3
elsif Rails::VERSION::MAJOR >= 3
Rails.application.routes.draw do
match 'time_loggers/stop' , :to => "time_loggers#stop"
match 'time_loggers/start' , :to => "time_loggers#start"
match 'time_loggers/suspend', :to => "time_loggers#suspend"
match 'time_loggers/resume' , :to => "time_loggers#resume"
match 'time_loggers/render_menu', :to => "time_loggers#render_menu"
match 'time_loggers/add_status_transition', :to => "time_loggers#add_status_transition"
match 'time_loggers/delete_status_transition', :to => "time_loggers#delete_status_transition"
match 'time_loggers/show_report', :to => "time_loggers#show_report"
match 'time_loggers/delete', :to => "time_loggers#delete"
match 'time_loggers' , :to => "time_loggers#index"
match 'time_loggers/stop' , :to => 'time_loggers#stop'
match 'time_loggers/start' , :to => 'time_loggers#start'
match 'time_loggers/suspend', :to => 'time_loggers#suspend'
match 'time_loggers/resume' , :to => 'time_loggers#resume'
match 'time_loggers/render_menu', :to => 'time_loggers#render_menu'
match 'time_loggers/add_status_transition', :to => 'time_loggers#add_status_transition'
match 'time_loggers/delete_status_transition', :to => 'time_loggers#delete_status_transition'
match 'time_loggers/show_report', :to => 'time_loggers#show_report'
match 'time_loggers/delete', :to => 'time_loggers#delete'
match 'time_loggers' , :to => 'time_loggers#index'
end
end

0 comments on commit 54f8aaa

Please sign in to comment.