aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXinhui2017-05-10 15:30:06 +0200
committerXinhui2017-05-10 15:30:06 +0200
commitbfd9121bc15e6c76e7e429c51d248e45758a3051 (patch)
tree97a0a28958cfdab58383864a3ee31305e34ce806
parent319ec987d5db94db0e3b373501bd33cb8cb7da7a (diff)
downloadchouette-core-bfd9121bc15e6c76e7e429c51d248e45758a3051.tar.bz2
Fix time_table duplicate should also duplicate tags
Refs #3329
-rw-r--r--app/models/chouette/time_table.rb3
-rw-r--r--spec/models/chouette/time_table_spec.rb5
2 files changed, 7 insertions, 1 deletions
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index 37f609163..60684411a 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -551,8 +551,9 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
def duplicate
tt = self.deep_clone :include => [:periods, :dates], :except => :object_version
tt.uniq_objectid
+ tt.tag_list.add(*self.tag_list) unless self.tag_list.empty?
tt.created_from = self
- tt.comment = I18n.t("activerecord.copy", :name => self.comment)
+ tt.comment = I18n.t("activerecord.copy", :name => self.comment)
tt
end
end
diff --git a/spec/models/chouette/time_table_spec.rb b/spec/models/chouette/time_table_spec.rb
index 18d76e805..1d0fa8585 100644
--- a/spec/models/chouette/time_table_spec.rb
+++ b/spec/models/chouette/time_table_spec.rb
@@ -1363,6 +1363,11 @@ end
end
describe "#duplicate" do
+ it 'should also copy tags' do
+ subject.tag_list.add('tag1', 'tag2')
+ expect(subject.duplicate.tag_list).to include('tag1', 'tag2')
+ end
+
it "should be a copy of" do
target=subject.duplicate
expect(target.id).to be_nil