Merge branch 'sismo' of github.com:afimb/chouette2 into sismo

1 files changed, 35 insertions, 21 deletions

diff --git a/app/helpers/breadcrumb_helper.rb b/app/helpers/breadcrumb_helper.rb
index 718147ce7..23cf6a6f2 100644
--- a/app/helpers/breadcrumb_helper.rb
+++ b/app/helpers/breadcrumb_helper.rb
@@ -28,6 +28,8 @@ module BreadcrumbHelper
       connection_link_breadcrumb action
     when "Chouette::TimeTable"
       time_table_breadcrumb action
+    when "StopAreaCopy"
+      stop_area_copy_breadcrumb action
     when "ImportTask"
       import_breadcrumb action
     when "Export"
@@ -36,33 +38,41 @@ module BreadcrumbHelper
       compliance_breadcrumb action
     when "RuleParameterSet"
       rule_parameter_breadcrumb action
+    when "User"
+      user_breadcrumb action
+    when "Organisation"
+      organisation_breadcrumb action
     else
       Rails.logger.info "---------"
       Rails.logger.info ">>>>>>> "+resource_class.to_s+" unmapped"
       Rails.logger.info "---------"
-      referential_breadcrumb
+      referential_breadcrumb action
     end
   end
   
 
   def network_breadcrumb(action)
     referential_breadcrumb
-    add_breadcrumb Referential.human_attribute_name("networks"), referential_networks_path(@referential) unless action == :index
+    add_breadcrumb Chouette::Network.model_name.human(:count => 2), referential_networks_path(@referential) unless action == :index
     add_breadcrumb breadcrumb_label(@network), referential_line_path(@referential, @network),:title => breadcrumb_tooltip(@network) if action == :edit
   end
 
   def group_of_line_breadcrumb(action)
     referential_breadcrumb
-    add_breadcrumb Referential.human_attribute_name("group_of_lines"), referential_group_of_lines_path(@referential) unless action == :index
+    add_breadcrumb Chouette::GroupOfLine.model_name.human(:count => 2), referential_group_of_lines_path(@referential) unless action == :index
     add_breadcrumb breadcrumb_label(@group_of_line), referential_group_of_line_path(@referential, @group_of_line),:title => breadcrumb_tooltip(@group_of_line) if action == :edit
   end
 
   def stop_area_breadcrumb(action)
     referential_breadcrumb
-    add_breadcrumb Referential.human_attribute_name("stop_areas"), referential_stop_areas_path(@referential) unless action == :index
+    add_breadcrumb Chouette::StopArea.model_name.human(:count => 2), referential_stop_areas_path(@referential) unless action == :index
     add_breadcrumb breadcrumb_label(@stop_area), referential_stop_area_path(@referential, @stop_area),:title => breadcrumb_tooltip(@stop_area) if action == :edit
   end
 
+  def stop_area_copy_breadcrumb(action)
+    stop_area_breadcrumb :edit
+  end
+
   def access_point_breadcrumb(action)
     stop_area_breadcrumb :edit
     add_breadcrumb breadcrumb_label(@access_point), referential_stop_area_access_point_path(@referential, @stop_area,@access_point),:title => breadcrumb_tooltip(@access_point) if action == :edit
@@ -76,19 +86,19 @@ module BreadcrumbHelper
 
   def connection_link_breadcrumb(action)
     referential_breadcrumb
-    add_breadcrumb Referential.human_attribute_name("connection_links"), referential_connection_links_path(@referential) unless action == :index
+    add_breadcrumb Chouette::ConnectionLink.model_name.human(:count => 2), referential_connection_links_path(@referential) unless action == :index
     add_breadcrumb breadcrumb_label(@connection_link), referential_connection_link_path(@referential, @connection_link),:title => breadcrumb_tooltip(@connection_link) if action == :edit
   end
 
   def time_table_breadcrumb(action)
     referential_breadcrumb
-    add_breadcrumb Referential.human_attribute_name("time_tables"), referential_time_tables_path(@referential) unless action == :index
+    add_breadcrumb Chouette::TimeTable.model_name.human(:count => 2), referential_time_tables_path(@referential) unless action == :index
     add_breadcrumb breadcrumb_label(@time_table), referential_time_table_path(@referential, @time_table),:title => breadcrumb_tooltip(@time_table) if action == :edit
   end
 
   def line_breadcrumb(action)
     referential_breadcrumb
-    add_breadcrumb Referential.human_attribute_name("lines"), referential_lines_path(@referential) unless action == :index
+    add_breadcrumb Chouette::Line.model_name.human(:count => 2), referential_lines_path(@referential) unless action == :index
     add_breadcrumb breadcrumb_label(@line), referential_line_path(@referential, @line),:title => breadcrumb_tooltip(@line) if action == :edit
   end
 
@@ -103,13 +113,8 @@ module BreadcrumbHelper
   end
 
   def vehicle_journey_breadcrumb(action)
-    if action == :index 
-      route_breadcrumb :edit
-    else 
-      @journey_pattern = @vehicle_journey.journey_pattern
-      journey_pattern_breadcrumb :edit
-      add_breadcrumb Referential.human_attribute_name("vehicle_journeys"), referential_line_route_vehicle_journeys_path(@referential, @line,@route)
-    end
+    route_breadcrumb :edit
+    add_breadcrumb I18n.t("breadcrumbs.vehicle_journeys"), referential_line_route_vehicle_journeys_path(@referential, @line,@route) unless action == :index
     add_breadcrumb breadcrumb_label(@vehicle_journey), referential_line_route_vehicle_journey_path(@referential, @line,@route,@vehicle_journey),:title => breadcrumb_tooltip(@vehicle_journey) if action == :edit
   end
   
@@ -119,7 +124,7 @@ module BreadcrumbHelper
 
   def company_breadcrumb (action)
     referential_breadcrumb 
-    add_breadcrumb Referential.human_attribute_name("companies"), referential_companies_path(@referential) unless action == :index
+    add_breadcrumb Chouette::Company.model_name.human(:count => 2), referential_companies_path(@referential) unless action == :index
     add_breadcrumb breadcrumb_label(@company), referential_company_path(@referential, @company),:title => breadcrumb_tooltip(@company) if action == :edit
   end
   
@@ -146,16 +151,25 @@ module BreadcrumbHelper
     add_breadcrumb Referential.human_attribute_name("rule_parameter_sets"), referential_rule_parameter_sets_path(@referential) unless action == :index
   end
 
-  def referential_breadcrumb
-    if @referential.present?
-      add_breadcrumb breadcrumb_label(@referential), referential_path(@referential),:title => breadcrumb_tooltip(@referential)
-    end
+  def referential_breadcrumb (action = :edit)
+    organisation_breadcrumb
+    add_breadcrumb breadcrumb_label(@referential), referential_path(@referential),:title => breadcrumb_tooltip(@referential) if action == :edit
   end
   
+  def organisation_breadcrumb (action = :edit)
+    add_breadcrumb I18n.t("breadcrumbs.referentials"), referentials_path 
+  end
+
+  def user_breadcrumb (action)
+    organisation_breadcrumb 
+    add_breadcrumb I18n.t("breadcrumbs.users"), organisation_path unless action == :index
+    add_breadcrumb breadcrumb_label(@user), organisation_user_path(@user),:title => breadcrumb_tooltip(@user) unless action == :index
+  end
+
   def breadcrumb_label(obj)
     label = breadcrumb_name(obj)
     if label.blank?
-      label = obj.id.to_s
+      label = obj.class.model_name.human+" "+obj.id.to_s
     end
     
     if label.length > 12
@@ -168,7 +182,7 @@ module BreadcrumbHelper
   def breadcrumb_tooltip(obj)
     label = breadcrumb_name(obj)
     if label.blank?
-      label = obj.class.model_name.human+"("+obj.id.to_s+")"
+      label = obj.class.model_name.human+" ("+obj.id.to_s+")"
     else
       label = obj.class.model_name.human+" : "+label
     end