From d31369e508a37a46e57146ef9157b0d140c3b073 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Wed, 7 Jan 2015 21:59:44 +0100
Subject: Fix root_url in mailer by unauthenticated_root_url

---
 app/views/layouts/mailer.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 387221103..b8dea72e8 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -18,7 +18,7 @@
   </div>
 
   <div style="color: #333333; text-align:center; font-size: 10px;">
-    Envoyé par <%= link_to root_url, "Chouette" %>
+    Envoyé par <%= link_to unauthenticated_root_url, "Chouette" %>
   </div>
 </body>
 </html>
-- 
cgit v1.2.3


From 8a4bb1eb66da1140375071ea153b83946b07aa71 Mon Sep 17 00:00:00 2001
From: Michel Etienne
Date: Thu, 8 Jan 2015 17:12:27 +0100
Subject: manage unauthenticated_root

---
 app/helpers/users_helper.rb                                 | 4 ++--
 app/views/devise/mailer/invitation_instructions.fr.html.erb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 0ddea8356..a4347bd18 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -5,10 +5,10 @@ module UsersHelper
   end
 
   def user_default_avatar
-    return "#{root_url}#{image_path('icons/user.png')}" if Rails.application.config.relative_url_root.blank?
+    return "#{authenticated_root_url}#{image_path('icons/user.png')}" if Rails.application.config.relative_url_root.blank?
 
     relative_url_root = Rails.application.config.relative_url_root.gsub( /\//, '')
-    "#{root_url}#{image_path('icons/user.png')}".
+    "#{authenticated_root_url}#{image_path('icons/user.png')}".
       sub( Regexp.new("/#{relative_url_root}/#{relative_url_root}/"), "/#{relative_url_root}/").
       sub( Regexp.new("/#{relative_url_root}//#{relative_url_root}/"), "/#{relative_url_root}/")
   end
diff --git a/app/views/devise/mailer/invitation_instructions.fr.html.erb b/app/views/devise/mailer/invitation_instructions.fr.html.erb
index 7ef4e6c99..c932763f2 100644
--- a/app/views/devise/mailer/invitation_instructions.fr.html.erb
+++ b/app/views/devise/mailer/invitation_instructions.fr.html.erb
@@ -1,6 +1,6 @@
 <p>Bonjour <%= @resource.email %>,</p>
 
-<p>Ce message est une invitation pour accéder à <%= link_to nil, root_url %>, vous pouvez l'accepter en cliquant sur le lien suivant :</p>
+<p>Ce message est une invitation pour accéder à <%= link_to nil, unauthenticated_root_url %>, vous pouvez l'accepter en cliquant sur le lien suivant :</p>
 
 <p><%= link_to "Accepter l'invitation", accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %></p>
 
-- 
cgit v1.2.3


From 283a9eed064a72c22c381c5025717b592c6cc4fb Mon Sep 17 00:00:00 2001
From: Michel Etienne
Date: Fri, 9 Jan 2015 07:54:33 +0100
Subject: manage unauthenticated_root

---
 app/controllers/registrations_controller.rb | 2 +-
 app/views/devise/passwords/edit.html.erb    | 2 +-
 app/views/devise/passwords/new.html.erb     | 2 +-
 app/views/layouts/_user_links.erb           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index b02d3217a..f563fbb03 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -6,7 +6,7 @@
 
    def accept_user_creation
      if !Rails.application.config.accept_user_creation
-       redirect_to root_path
+       redirect_to unauthenticated_root_path
        return false
      else
        return true
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index 7b408a149..0c5ba77cf 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -9,7 +9,7 @@
       <%= f.input :password_confirmation, :as => :password %>
       
       <div class="col-md-offset-2">
-        <%= link_to t("cancel"), root_path, :class => "btn btn-default" %>    
+        <%= link_to t("cancel"), unauthenticated_root_path, :class => "btn btn-default" %>    
         <%= f.button :submit, :value => t("devise.passwords.edit.commit"), :class => "btn-info" %>
       </div>
       <% end %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 865805319..498e24c4c 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -6,7 +6,7 @@
       <%= form.input :email, :as => :email, placeholder: 'user@domain.com'  %> 
 
       <div class="col-md-offset-2">
-        <%= link_to t("cancel"), root_path, :class => "btn btn-default" %>    
+        <%= link_to t("cancel"), unauthenticated_root_path, :class => "btn btn-default" %>    
         <%= form.button :submit, :value => t("devise.passwords.new.commit"), :class => "btn-info" %>
       </div>
       <% end %>
diff --git a/app/views/layouts/_user_links.erb b/app/views/layouts/_user_links.erb
index 404f52172..bd9196b3f 100644
--- a/app/views/layouts/_user_links.erb
+++ b/app/views/layouts/_user_links.erb
@@ -1,5 +1,5 @@
 <ul class="user">
-  <li class="home"><%= link_to  t('layouts.home'), root_path %></li>
+  <li class="home"><%= link_to  t('layouts.home'), authenticated_root_path %></li>
 
   <% if user_signed_in?  %>
   <li> | </li>
-- 
cgit v1.2.3


From 1954d7d21b3b964701172d0ca40f6f99900d0ff5 Mon Sep 17 00:00:00 2001
From: Michel Etienne
Date: Fri, 9 Jan 2015 11:33:30 +0100
Subject: manage unauthenticated_root

---
 app/views/layouts/mailer.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index b8dea72e8..ac00bdfea 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -18,7 +18,7 @@
   </div>
 
   <div style="color: #333333; text-align:center; font-size: 10px;">
-    Envoyé par <%= link_to unauthenticated_root_url, "Chouette" %>
+    Envoyé par <%= link_to "Chouette", unauthenticated_root_url %>
   </div>
 </body>
 </html>
-- 
cgit v1.2.3


From 4574ad2fb9d1622396d86aa26074930f5cfa5c16 Mon Sep 17 00:00:00 2001
From: Michel Etienne
Date: Fri, 9 Jan 2015 17:40:47 +0100
Subject: add tests for hub export

---
 app/helpers/rule_parameter_sets_helper.rb    |  5 +++++
 app/helpers/users_helper.rb                  | 32 ++++++++++++++++++++++------
 app/views/help/group_of_lines.textile        |  1 +
 app/views/help/index.textile                 |  2 +-
 app/views/help/routes.textile                | 16 ++++++++++++++
 app/views/rule_parameter_sets/_form.html.erb |  3 ---
 app/views/rule_parameter_sets/show.html.erb  | 10 ++++-----
 7 files changed, 54 insertions(+), 15 deletions(-)

(limited to 'app')

diff --git a/app/helpers/rule_parameter_sets_helper.rb b/app/helpers/rule_parameter_sets_helper.rb
index 8485b63ca..538a5cddd 100644
--- a/app/helpers/rule_parameter_sets_helper.rb
+++ b/app/helpers/rule_parameter_sets_helper.rb
@@ -13,6 +13,11 @@ module RuleParameterSetsHelper
     return t("rule_parameter_sets.labels.lower_char") if value == "4"
   end
   
+  def boolean_value(value)
+    return t("true") if value == "1"
+    t "false"
+  end
+  
 end
 
 
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index ea5f41fb7..11fd7af34 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -4,13 +4,33 @@ module UsersHelper
       image_tag user_image(user), :alt => "", :class => "preview", :width => size, :height => size
   end
 
-  def user_default_avatar
-    return "#{authenticated_root_url}#{image_path('icons/user.png')}" if Rails.application.config.relative_url_root.blank?
+#  def user_default_avatar
+#    return "#{authenticated_root_url}#{image_path('icons/user.png')}" if Rails.application.config.relative_url_root.blank?
+#   relative_url_root = Rails.application.config.relative_url_root.gsub( /\//, '')
+#    "#{authenticated_root_url}#{image_path('icons/user.png')}".
+#      sub( Regexp.new("/#{relative_url_root}/#{relative_url_root}/"), "/#{relative_url_root}/").
+#      sub( Regexp.new("/#{relative_url_root}//#{relative_url_root}/"), "/#{relative_url_root}/")
+#  end
 
-    relative_url_root = Rails.application.config.relative_url_root.gsub( /\//, '')
-    "#{authenticated_root_url}#{image_path('icons/user.png')}".
-      sub( Regexp.new("/#{relative_url_root}/#{relative_url_root}/"), "/#{relative_url_root}/").
-      sub( Regexp.new("/#{relative_url_root}//#{relative_url_root}/"), "/#{relative_url_root}/")
+  def gravatar_hash(user)
+    Digest::MD5.hexdigest( user.email)
+  end
+  def gravatar_url( user)
+    "http://www.gravatar.com/avatar/#{gravatar_hash(user)}?d=404"
+  end
+  def user_image(user)
+    begin
+      gravatar_resource = RestClient.get( gravatar_url( user)){|response, request, result| response }
+    rescue
+      # Happens if network is not available
+      return 'icons/user.png'
+    end
+    if gravatar_resource.code == 404
+      # Happens if user has not registered to gravatar
+      'icons/user.png'
+    else
+      gravatar_url( user)
+    end
   end
 
 end
diff --git a/app/views/help/group_of_lines.textile b/app/views/help/group_of_lines.textile
index 9ab7d440a..8fd05c7ea 100644
--- a/app/views/help/group_of_lines.textile
+++ b/app/views/help/group_of_lines.textile
@@ -46,6 +46,7 @@ h3. Attributs d'un groupe de lignes
 
 * Nom : nom du groupe de lignes 
 * Commentaire : Champs de saisie libre pour identifier l'usage du groupe de lignes.
+* Numéro d'enregistrement : Le numéro d'enregistrement est unique. Aucune règle de nommage ne s'applique sur ce numéro. Celui-ci doit être unique sur l'ensemble des groupes de lignes.
 
 
 
diff --git a/app/views/help/index.textile b/app/views/help/index.textile
index 19eeb63e2..b0d2fddcf 100644
--- a/app/views/help/index.textile
+++ b/app/views/help/index.textile
@@ -28,7 +28,7 @@ h4. Version 2.5.2
 
 * Nouvelles foctionnalités :
 ** Ajout des particularités de monté/descente aux arrêts d'une séquence
-** Ajout de tests sur les données pour l'export
+** Ajout de points de contrôle sur les données pour l'export
 
 h4. Version 2.5.1
 
diff --git a/app/views/help/routes.textile b/app/views/help/routes.textile
index eb1093340..0396898ae 100644
--- a/app/views/help/routes.textile
+++ b/app/views/help/routes.textile
@@ -47,6 +47,22 @@ On peut modifier une séquence d'arrêts en cliquant sur le bouton de modificati
 !2014-10-31_112543.png! 
 Modification des arrêts d'une séquence
 
+h3. Contraintes de montée - descente
+
+On peut ajouter des règles de montée ou de descente aux arrêts de la séquence d'arrêt (interdit ou à la demande); ces règles s'appliquent à toutes les courses de la séquence d'arrêt
+
+Les règles sont : 
+
+* Non défini (par défaut)
+* Montée autorisée
+* Montée interdite
+* Montée sur réservation
+* Montée sur demande au conducteur
+* Descente autorisée
+* Descente interdite
+* Descente sur réservation
+* Descente sur demande au conducteur
+
 h3. Supprimer une séquence d'arrêts
 
 Il est possible de supprimer une séquence d'arrêts depuis la page de la ligne. Chaque élément de la liste des séquences d'arrêts en bas de la page est dotée d'un pictogramme de suppression. Il est à noter que la suppression de la séquence d'arrêts ne supprime par les arrêts qu'elle contient. 
diff --git a/app/views/rule_parameter_sets/_form.html.erb b/app/views/rule_parameter_sets/_form.html.erb
index 905e7f691..abe4b0c96 100644
--- a/app/views/rule_parameter_sets/_form.html.erb
+++ b/app/views/rule_parameter_sets/_form.html.erb
@@ -15,9 +15,6 @@
     <%= form.input :inter_stop_duration_max, :as => :number %>
     <%= form.input :facility_stop_area_distance_max, :as => :number %>
     
-    <%= form.input :vehicle_journey_number_min, :as => :number %>
-    <%= form.input :vehicle_journey_number_max, :as => :number %>
-    
     <%= form.input :check_lines_in_groups, :as => :boolean %>
     <%= form.input :check_line_routes, :as => :boolean %>
     <%= form.input :check_stop_parent, :as => :boolean %>
diff --git a/app/views/rule_parameter_sets/show.html.erb b/app/views/rule_parameter_sets/show.html.erb
index 810730e50..e86aa47ac 100644
--- a/app/views/rule_parameter_sets/show.html.erb
+++ b/app/views/rule_parameter_sets/show.html.erb
@@ -71,27 +71,27 @@
     
     <p>
       <label><%= RuleParameterSet.human_attribute_name("check_lines_in_groups") %>: </label>
-      <%= @rule_parameter_set.check_lines_in_groups ? t("true") : t("false") %>
+      <%= boolean_value(@rule_parameter_set.check_lines_in_groups)%>
     </p>
 
     <p>
       <label><%= RuleParameterSet.human_attribute_name("check_line_routes") %>: </label>
-      <%= @rule_parameter_set.check_line_routes ? t("true") : t("false") %>
+      <%= boolean_value(@rule_parameter_set.check_line_routes)  %>
     </p>
 
     <p>
       <label><%= RuleParameterSet.human_attribute_name("check_stop_parent") %>: </label>
-      <%= @rule_parameter_set.check_stop_parent ? t("true") : t("false") %>
+      <%= boolean_value(@rule_parameter_set.check_stop_parent)  %>
     </p>
 
     <p>
       <label><%= RuleParameterSet.human_attribute_name("check_connection_link_on_physical") %>: </label>
-      <%= @rule_parameter_set.check_allowed_transport_modes ? t("true") : t("false") %>
+      <%= boolean_value(@rule_parameter_set.check_connection_link_on_physical) %>
     </p>
 
     </p>
       <label><%= RuleParameterSet.human_attribute_name("check_allowed_transport_modes") %>: </label>
-      <%= @rule_parameter_set.check_allowed_transport_modes ? t("true") : t("false") %>
+      <%= boolean_value(@rule_parameter_set.check_allowed_transport_modes) %>
     </p>
 
 
-- 
cgit v1.2.3


From 810c0135bc448371dddd5232d5339edcb3bbb464 Mon Sep 17 00:00:00 2001
From: Michel Etienne
Date: Tue, 20 Jan 2015 15:58:38 +0100
Subject: stop area copy routes to copy instead of original

---
 app/controllers/stop_area_copies_controller.rb |  2 +-
 app/models/stop_area_copy.rb                   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'app')

diff --git a/app/controllers/stop_area_copies_controller.rb b/app/controllers/stop_area_copies_controller.rb
index 7c1fac8d9..fb429595e 100644
--- a/app/controllers/stop_area_copies_controller.rb
+++ b/app/controllers/stop_area_copies_controller.rb
@@ -18,7 +18,7 @@ class StopAreaCopiesController < ChouetteController
     @stop_area_copy = StopAreaCopy.new(params[:stop_area_copy])
     @stop_area = parent
     if @stop_area_copy.save
-      redirect_to referential_stop_area_path( @referential,parent ), notice: I18n.t("stop_area_copies.new.success")
+      redirect_to referential_stop_area_path( @referential,@stop_area_copy.copy ), notice: I18n.t("stop_area_copies.new.success")
     else
       flash[:error] = I18n.t("stop_area_copies.errors.copy_aborted") + "<br>" + @stop_area_copy.errors.full_messages.join("<br>")
       render :action => :new
diff --git a/app/models/stop_area_copy.rb b/app/models/stop_area_copy.rb
index 796aba567..041d30eb9 100644
--- a/app/models/stop_area_copy.rb
+++ b/app/models/stop_area_copy.rb
@@ -5,7 +5,7 @@ class StopAreaCopy
   include ActiveModel::Conversion
   extend  ActiveModel::Naming
 
-  attr_accessor :source_id, :hierarchy, :area_type, :source
+  attr_accessor :source_id, :hierarchy, :area_type, :source, :copy
   
   validates_presence_of :source_id, :hierarchy, :area_type
   
@@ -40,17 +40,17 @@ class StopAreaCopy
     begin
       if self.valid?
         self.source ||= Chouette::StopArea.find self.source_id
-        copy = source.duplicate
-        copy.name = source.name
-        copy.area_type = self.area_type.camelcase
+        self.copy = source.duplicate
+        self.copy.name = source.name
+        self.copy.area_type = self.area_type.camelcase
         Chouette::StopArea.transaction do
           if self.hierarchy == "child"
-            copy.parent_id = source.id
+            self.copy.parent_id = source.id
           end
-          copy.save!
+          self.copy.save!
           if self.hierarchy == "parent"
-            source.parent_id = copy.id
-            source.save!
+            self.source.parent_id = copy.id
+            self.source.save!
           end
         end
         true
-- 
cgit v1.2.3