diff options
| author | Michel Etienne | 2014-07-11 11:34:23 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-07-11 11:34:23 +0200 |
| commit | 1d4ebedf4cfe07689530f9f0e443a020cc008fd4 (patch) | |
| tree | b5614ecdf47c97c2f84a8a489a5bb4f48df47c34 /app | |
| parent | e8a31cd30f9b35ef9d33ba114304b537ab7a638e (diff) | |
| download | chouette-core-1d4ebedf4cfe07689530f9f0e443a020cc008fd4.tar.bz2 | |
add union, intersection and disjunction operation on time tables specs, Mantis 26838
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/time_table_combination.rb | 1 | ||||
| -rw-r--r-- | app/views/time_tables/_combine.html.erb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/models/time_table_combination.rb b/app/models/time_table_combination.rb index a446b47df..d42a0aa49 100644 --- a/app/models/time_table_combination.rb +++ b/app/models/time_table_combination.rb @@ -25,7 +25,6 @@ class TimeTableCombination def combine source = Chouette::TimeTable.find( source_id) combined = Chouette::TimeTable.find( combined_id) - puts operation if operation == "union" source.merge! combined elsif operation == "intersection" diff --git a/app/views/time_tables/_combine.html.erb b/app/views/time_tables/_combine.html.erb index 900a8a4e8..0e40ec88e 100644 --- a/app/views/time_tables/_combine.html.erb +++ b/app/views/time_tables/_combine.html.erb @@ -22,6 +22,6 @@ hintText: '<%= t('search_hint') %>', noResultsText: '<%= t('no_result_text') %>', searchingText: '<%= t('searching_term') %>' - }); + }); }); </script> |