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

update gems and fix i18n and aasm deprecation warnings

Browse source
This commit is contained in:
Reinier Balt 2013-12-30 20:52:35 +01:00
parent b1c306b09e
commit 17dca39d3a
10 changed files with 113 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/project.rb
View file

@ -89,7 +89,7 @@ class Project < ActiveRecord::Base
# as a result of acts_as_state_machine calling state=() to update the attribute
def transition_to(candidate_state)
case candidate_state.to_sym
when aasm_current_state
when aasm.current_state
return
when :hidden
hide!

2
app/models/todo.rb
View file

@ -66,7 +66,7 @@ class Todo < ActiveRecord::Base
# state machine
include AASM
aasm_initial_state Proc.new { |t| (t.show_from && t.user && (t.show_from > t.user.date)) ? :deferred : :active}
aasm_initial_state = Proc.new { |t| (t.show_from && t.user && (t.show_from > t.user.date)) ? :deferred : :active}
aasm :column => :state do

2
app/views/projects/show.m.erb
View file

@ -28,4 +28,4 @@
<% else -%><%= render :partial => "notes/notes_summary", :collection => @project.notes %>
<% end -%>
<h2><%= t('projects.settings') %></h2>
<%= t('projects.state', :state => project.aasm_current_state.to_s) %>. <%= @project_default_context %>
<%= t('projects.state', :state => project.aasm.current_state.to_s) %>. <%= @project_default_context %>

8
app/views/projects/update_status.js.rjs
View file

@ -1,11 +1,11 @@
# TODO: is this dead code?
page.select('#project_status .active span').each do |element|
element.className = @project.aasm_current_state == :active ? 'active_state' : 'inactive_state'
element.className = @project.aasm.current_state == :active ? 'active_state' : 'inactive_state'
end
page.select('#project_status .hidden span').each do |element|
element.className = @project.aasm_current_state == :hidden ? 'active_state' : 'inactive_state'
element.className = @project.aasm.current_state == :hidden ? 'active_state' : 'inactive_state'
end
page.select('#project_status .completed span').each do |element|
element.className = @project.aasm_current_state == :completed ? 'active_state' : 'inactive_state'
element.className = @project.aasm.current_state == :completed ? 'active_state' : 'inactive_state'
end
page.notify :notice, "Set project status to #{@project.aasm_current_state}", 5.0
page.notify :notice, "Set project status to #{@project.aasm.current_state}", 5.0