aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXinhui2017-05-02 13:00:33 +0200
committerjpl2017-05-04 10:07:17 +0200
commit0dc3fcfdf767af04a11ee85c43178146b033b624 (patch)
treeb79067b2516967ffc146e192c3e4b0f3196f82e8
parent49131bcabe63d82280d0b7e854c4a24958597264 (diff)
downloadchouette-core-0dc3fcfdf767af04a11ee85c43178146b033b624.tar.bz2
TimeTables#edit save color from state
Refs #2899
-rw-r--r--app/models/chouette/time_table.rb2
-rw-r--r--spec/models/chouette/time_table_spec.rb6
2 files changed, 7 insertions, 1 deletions
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index fcdc525a9..11e7293f1 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -90,7 +90,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
end
def self.state_permited_attributes item
- item.slice('comment').to_hash
+ item.slice('comment', 'color').to_hash
end
def presenter
diff --git a/spec/models/chouette/time_table_spec.rb b/spec/models/chouette/time_table_spec.rb
index 579300b74..18d76e805 100644
--- a/spec/models/chouette/time_table_spec.rb
+++ b/spec/models/chouette/time_table_spec.rb
@@ -51,6 +51,12 @@ describe Chouette::TimeTable, :type => :model do
}.to change {subject.periods.count}.by(-1)
end
+ it 'should update color' do
+ state['color'] = '#FFA070'
+ subject.state_update state
+ expect(subject.reload.color).to eq(state['color'])
+ end
+
it 'should save new tags' do
subject.tag_list = "awesome, great"
subject.save