adapt to Neptune specifications V4

2 files changed, 25 insertions, 9 deletions

diff --git a/app/views/access_links/_form.html.erb b/app/views/access_links/_form.html.erb
index 2ce44542f..d6c0c603e 100644
--- a/app/views/access_links/_form.html.erb
+++ b/app/views/access_links/_form.html.erb
@@ -4,12 +4,12 @@
     <%= form.input :stop_area_id , :as => :hidden %>
     <%= form.input :link_orientation_type , :as => :hidden%>
     <%= form.input :name %>
-    <%= form.input :access_link_type, :as => :select, :collection => Chouette::AccessLink.access_link_types, :include_blank => false, :member_label => Proc.new { |type| t("connection_link_types.label.#{type}") }  %>
+    <%= form.input :access_link_type, :as => :select, :collection => Chouette::AccessLink.access_link_types, :include_blank => true, :member_label => Proc.new { |type| t("connection_link_types.label.#{type}") }  %>
     <%= form.input :comment %>
     <%= form.input :link_distance %>
-    <%= form.input :mobility_restricted_suitability,:as => :boolean %>
-    <%= form.input :stairs_availability,:as => :boolean %>
-    <%= form.input :lift_availability,:as => :boolean %>
+    <%= form.input :mobility_restricted_suitability, :as => :select, :collection => [[t("true"), true], [t("false"), false]], :include_blank => true %>
+    <%= form.input :stairs_availability, :as => :select, :collection => [[t("true"), true], [t("false"), false]], :include_blank => true %>
+    <%= form.input :lift_availability, :as => :select, :collection => [[t("true"), true], [t("false"), false]], :include_blank => true %>
     <%= form.input :objectid, :required => !@access_link.new_record?, :input_html => { :title => t("formtastic.titles.access_link.objectid")} %>  
     <%= form.inputs :name => t('access_links.show.durations') do %> 
       <%= form.input :default_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :label => @access_link.human_attribute_name("default_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>       
diff --git a/app/views/access_links/show.html.erb b/app/views/access_links/show.html.erb
index 3999b0287..54f89297e 100644
--- a/app/views/access_links/show.html.erb
+++ b/app/views/access_links/show.html.erb
@@ -6,7 +6,11 @@
   <div class="summary">
     <p>
       <label><%= @access_link.human_attribute_name("access_link_type") %>: </label>
-      <%= t("connection_link_types.label.#{@access_link.access_link_type}") %>
+      <% if @access_link.access_link_type.present? %>
+        <%= t("connection_link_types.label.#{@access_link.access_link_type}") %>
+      <% else %>
+         <%=t("unknown") %>
+      <% end %>
     </p>
     <p>
       <label><%= @access_link.human_attribute_name("comment") %>: </label>
@@ -39,21 +43,33 @@
     </p>
     <p>
       <label class='duration'><%= @access_link.human_attribute_name("mobility_restricted_traveller_duration") %>: </label>
-      <% if (@access_link.mobility_restricted_traveller_duration.present?) %>
+      <% if (!@access_link.mobility_restricted_traveller_duration.nil?) %>
          <%= @access_link.mobility_restricted_traveller_duration.strftime('%Hh %Mm %Ss') %>
       <% end %>
     </p>
     <p>
       <label><%= @access_link.human_attribute_name("mobility_restricted_suitability") %>: </label>
-      <%= t((@access_link.mobility_restricted_suitability == true).to_s) %>
+      <% if (!@access_link.mobility_restricted_suitability.nil?) %>
+        <%= t((@access_link.mobility_restricted_suitability == true).to_s) %>
+      <% else %>
+         <%=t("unknown") %>
+      <% end %>
     </p>
     <p>
       <label><%= @access_link.human_attribute_name("stairs_availability") %>: </label>
-      <%= t((@access_link.stairs_availability == true).to_s) %>
+      <% if (!@access_link.stairs_availability.nil?) %>
+         <%= t((@access_link.stairs_availability == true).to_s) %>
+      <% else %>
+         <%=t("unknown") %>
+      <% end %>
     </p>
     <p>
       <label><%= @access_link.human_attribute_name("lift_availability") %>: </label>
-      <%= t((@access_link.lift_availability == true).to_s) %>
+      <% if (!@access_link.lift_availability.nil?) %>
+         <%= t((@access_link.lift_availability == true).to_s) %>
+      <% else %>
+         <%=t("unknown") %>
+      <% end %>
     </p>
   </div>
 </div>