aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorZog2018-01-26 16:17:22 +0100
committercedricnjanga2018-02-06 11:21:37 -0800
commit3fa91b720184edfe319081230decc13f695072b2 (patch)
tree65dd8409da84aeca65543c702289127c75f2ec42 /app
parentee63b07c01a1a32bb0d2619e9d4f1bf100fc1d1a (diff)
downloadchouette-core-3fa91b720184edfe319081230decc13f695072b2.tar.bz2
Refs #5750 @1h; Add a "kind" attribute to StopAreas
This determines if the StopArea is commercial or not The useless fields are hidden in the form for the non-commercials ones
Diffstat (limited to 'app')
-rw-r--r--app/models/chouette/stop_area.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index cf2afbc73..565fa5f4b 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -117,7 +117,13 @@ module Chouette
end
end
+<<<<<<< HEAD
alias_method :local_id, :user_objectid
+=======
+ def local_id
+ id.to_s
+ end
+>>>>>>> Refs #5750 @1h; Add a "kind" attribute to StopAreas
def children_in_depth
return [] if self.children.empty?