diff options
| author | jpl | 2017-04-24 11:56:25 +0200 |
|---|---|---|
| committer | jpl | 2017-04-24 11:56:25 +0200 |
| commit | 208c82b3a2a716e7481afedef429088ec5898c33 (patch) | |
| tree | 11d923a93e9bcd205512639d51dbb02e89d0f9e9 | |
| parent | 1cbed80c913420c76ac7d3716b9d8c4bf4e14278 (diff) | |
| download | chouette-core-208c82b3a2a716e7481afedef429088ec5898c33.tar.bz2 | |
Refs #3158: adding 'deleted_at' column on stop_areas
| -rw-r--r-- | app/views/stop_areas/index.html.slim | 6 | ||||
| -rw-r--r-- | config/locales/stop_areas.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/stop_areas.fr.yml | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/app/views/stop_areas/index.html.slim b/app/views/stop_areas/index.html.slim index bc1529e68..27c9372ac 100644 --- a/app/views/stop_areas/index.html.slim +++ b/app/views/stop_areas/index.html.slim @@ -16,10 +16,10 @@ - if @stop_areas.any? .row .col-lg-12 + p = t('activerecord.attributes.stop_point.deleted_at') = table_builder @stop_areas, - { 'Oid' => Proc.new { |n| n.try(:user_objectid) }, - :name => 'name', :registration_number => 'registration_number', :zip_code => 'zip_code', - :city_name => 'city_name', :area_type => Proc.new{|s| (s.area_type.nil? ? '-' : t("enumerize.stop_area.area_type.#{s.try(:area_type)}"))} }, + { 'ID Reflex' => Proc.new { |n| n.try(:user_objectid) }, :name => 'name', :registration_number => 'registration_number', :deleted_at => Proc.new{|s| s.deleted_at ? t('false') : t('true')}, + :zip_code => 'zip_code', :city_name => 'city_name', :area_type => Proc.new{|s| (s.area_type.nil? ? '-' : t("enumerize.stop_area.area_type.#{s.try(:area_type)}"))} }, [:show, :edit, :delete], [], 'table has-filter has-search' diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml index 8bb5b52c1..6c08b6681 100644 --- a/config/locales/stop_areas.en.yml +++ b/config/locales/stop_areas.en.yml @@ -14,6 +14,7 @@ en: new: "Add a new stop" edit: "Edit this stop" destroy: "Remove this stop" + deleted_at: "Activated" destroy_confirm: "Are you sure you want destroy this stop and all of his children ?" select_parent: "Create or modify the relation child -> parent" add_children: "Create or modify the relation parent -> children" diff --git a/config/locales/stop_areas.fr.yml b/config/locales/stop_areas.fr.yml index d3469e87f..3e49cdf7c 100644 --- a/config/locales/stop_areas.fr.yml +++ b/config/locales/stop_areas.fr.yml @@ -89,6 +89,7 @@ fr: registration_number: "Numéro d'enregistrement" published_name: "Nom public" deleted: "Supprimé" + deleted_at: "Activé" comment: "Commentaire" stop_area_type: "Type d'arrêt" area_type: "Type d'arrêt" |