Solving merge V2_5 pbs

3 files changed, 43 insertions, 16 deletions

diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb
index 643c780a4..a0ca4b4ea 100644
--- a/app/controllers/referentials_controller.rb
+++ b/app/controllers/referentials_controller.rb
@@ -1,11 +1,17 @@
 class ReferentialsController < BreadcrumbController
 
   defaults :resource_class => Referential
-  
+
   respond_to :html
   respond_to :json, :only => :show
   respond_to :js, :only => :show
 
+  def new
+    new! do
+      @referential.data_format = current_organisation.data_format
+    end
+  end
+  
   def show
      resource.switch
      show! do |format|
@@ -17,7 +23,7 @@ class ReferentialsController < BreadcrumbController
                 :referential_id => resource.id}
        }
        format.html { build_breadcrumb :show}
-       
+
      end
   end
 
diff --git a/app/controllers/routes_controller.rb b/app/controllers/routes_controller.rb
index afaa8adba..6dfaf3dd0 100644
--- a/app/controllers/routes_controller.rb
+++ b/app/controllers/routes_controller.rb
@@ -9,7 +9,7 @@ class RoutesController < ChouetteController
     belongs_to :line, :parent_class => Chouette::Line, :optional => true, :polymorphic => true
   end
 
-  def index     
+  def index
     index! do |format|
       format.html { redirect_to referential_line_path(@referential,@line) }
     end
@@ -28,16 +28,15 @@ class RoutesController < ChouetteController
       render "edit_boarding_alighting"
     end
   end
-  
+
   def show
     @map = RouteMap.new(route).with_helpers(self)
-    @stop_points = route.stop_points.paginate(:page => params[:page])
     show! do
       build_breadcrumb :show
     end
   end
 
-  # overwrite inherited resources to use delete instead of destroy 
+  # overwrite inherited resources to use delete instead of destroy
   # foreign keys will propagate deletion)
   def destroy_resource(object)
     object.delete
@@ -52,6 +51,7 @@ class RoutesController < ChouetteController
   def create
     create! do |success, failure|
       success.html { redirect_to referential_line_path(@referential,@line) }
+      failure.html { flash[:alert] = route.errors[:flash]; render :action => :new }
     end
   end
 
@@ -66,7 +66,7 @@ class RoutesController < ChouetteController
 
   def collection
     @q = parent.routes.search(params[:q])
-    @routes ||= 
+    @routes ||=
       begin
         routes = @q.result(:distinct => true).order(:name)
         routes = routes.paginate(:page => params[:page]) if @per_page.present?
diff --git a/app/controllers/rule_parameter_sets_controller.rb b/app/controllers/rule_parameter_sets_controller.rb
index a422bed15..7741411fe 100644
--- a/app/controllers/rule_parameter_sets_controller.rb
+++ b/app/controllers/rule_parameter_sets_controller.rb
@@ -1,29 +1,50 @@
-class RuleParameterSetsController < ChouetteController
+class RuleParameterSetsController < BreadcrumbController
   defaults :resource_class => RuleParameterSet
   respond_to :html
   respond_to :js, :only => [ :mode ]
 
-  belongs_to :referential
-
   def new
-    @rule_parameter_set = RuleParameterSet.default( @referential)
+    @rule_parameter_set = RuleParameterSet.default( current_organisation)
     new! do
-      build_breadcrumb :new    
+      build_breadcrumb :new
     end
   end
 
 
   def destroy
-    if @referential.rule_parameter_sets.count == 1
-      flash[:alert] = "Suppression impossible, le referentiel doit compter au minimum un jeu de parametre."
-      redirect_to referential_rule_parameter_sets_path( @referential )
+    if current_organisation.rule_parameter_sets.count == 1
+      flash[:alert] = t('rule_parameter_sets.destroy.last_rps_protected')
+      redirect_to organisation_rule_parameter_sets_path
     else
-      destroy!
+      destroy! do |success, failure|
+        success.html { redirect_to organisation_rule_parameter_sets_path }
+      end
+    end
+  end
+
+  def update
+    update! do |success, failure|
+      success.html { redirect_to organisation_rule_parameter_sets_path }
+    end
+  end
+
+  def create
+    create! do |success, failure|
+      success.html { redirect_to organisation_rule_parameter_sets_path }
     end
   end
 
   protected
 
   alias_method :rule_parameter_set, :resource
+
+  def collection
+    @rule_parameter_sets = current_organisation.rule_parameter_sets
+  end
+
+  def create_resource(rule_parameter_sets)
+    rule_parameter_sets.organisation = current_organisation
+    super
+  end
 end