Merge branch 'master' of github.com:AF83/stif-boiv. Refs #824

7 files changed, 45 insertions, 17 deletions

diff --git a/app/models/line_referential.rb b/app/models/line_referential.rb
index e17aea456..b5ba56d7b 100644
--- a/app/models/line_referential.rb
+++ b/app/models/line_referential.rb
@@ -6,4 +6,6 @@ class LineReferential < ActiveRecord::Base
     attributes = options.merge organisation: organisation
     line_referential_memberships.build attributes
   end
+
+  validates :name, presence: true
 end
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 2df4f3d97..4df538161 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -21,17 +21,23 @@
             </div>
             <div class="col-md-6 new_password">
               <%= link_to t("devise.links.new_password"), new_password_path(resource_name) %>
-              <% if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-                <br>
-                <%= link_to t("devise.links.new_confirmation"), new_confirmation_path(resource_name) %>
-              <% end %>
+                <!-- FIXME ref #819 -->
+                <%- if false %>
+                  <% if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+                    <br>
+                    <%= link_to t("devise.links.new_confirmation"), new_confirmation_path(resource_name) %>
+                  <% end %>
+                <% end %>
             </div>
           </div>
         <% end %>
       </div>
     </div>
-    <%= render partial: 'devise/shared/form_registration', locals: {
+    <!-- FIXME ref #819 -->
+    <%- if false %>
+      <%= render partial: 'devise/shared/form_registration', locals: {
       organisation: (resource.organisation || Organisation.new) } %>
+    <% end %>
 
   </div>
 </div>
diff --git a/app/views/organisations/show.html.erb b/app/views/organisations/show.html.erb
index f6c497173..3994228fd 100644
--- a/app/views/organisations/show.html.erb
+++ b/app/views/organisations/show.html.erb
@@ -48,8 +48,11 @@
 
 <% content_for :sidebar do %>
 <ul class="actions">
+<!-- FIXME ref #819 -->
+<% if false %>
   <li><%= link_to t('organisations.actions.edit'), edit_organisation_path, :class => "edit" %></li>
   <li><%= link_to t('users.actions.new'), new_organisation_user_path, :class => "add" %></li>
+<% end %>
   <li><%= link_to t('rule_parameter_sets.actions.new'), new_organisation_rule_parameter_set_path, :class => "add" %></li>
 </ul>
 <% end %>
diff --git a/app/views/referentials/index.html.erb b/app/views/referentials/index.html.erb
index afd339bb0..cb84f39cc 100644
--- a/app/views/referentials/index.html.erb
+++ b/app/views/referentials/index.html.erb
@@ -1,12 +1,18 @@
-<%= title_tag Referential.model_name.human(:count => 2) %>
 
-<div class="referentials paginated_content">
-  <%= paginated_content @referentials %>
-</div>
+<!-- FIXME #823 -->
+<% if false %>
+  <%= title_tag Referential.model_name.human(:count => 2) %>
+  <div class="referentials paginated_content">
+    <%= paginated_content @referentials %>
+  </div>
+<% end %>
 
 <% content_for :sidebar do %>
 <ul class="actions">
-  <li><%= link_to t('referentials.actions.new'), new_referential_path, :class => "add" %></li>
+  <!-- FIXME #823 -->
+  <% if false %>
+    <li><%= link_to t('referentials.actions.new'), new_referential_path, :class => "add" %></li>
+  <% end %>
 </ul>
 <ul>
   <!-- FIXME #820 -->
diff --git a/app/views/shared/_header.erb b/app/views/shared/_header.erb
index 9d53d807f..ae712e48d 100644
--- a/app/views/shared/_header.erb
+++ b/app/views/shared/_header.erb
@@ -95,8 +95,13 @@
         <li class="dropdown">
           <a href="#" class="dropdown-toggle user_admin" data-toggle="dropdown"><span class="gravatar"><%= user_gravatar_image_tag(current_user, 16) %></span><%= truncate(current_user.name, :length => 20) %> <b class="caret"></b></a>
           <ul class="dropdown-menu">
-            <li><%= link_to t('layouts.user.profile'), edit_user_registration_path %></li>
-            <li><%= link_to t('layouts.user.sign_out'), destroy_user_session_path, :method => :delete %></li>
+
+              <!-- FIXME ref #819 -->
+              <%- if false %>
+                <li><%= link_to t('layouts.user.profile'), edit_user_registration_path %></li>
+              <% end %>
+
+              <li><%= link_to t('layouts.user.sign_out'), destroy_user_session_path, :method => :delete %></li>
             <li class="divider"></li>
             <li><%= tab_link_to Organisation.model_name.human, organisation_path %></li>
           </ul>
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index c4b396650..7cd0cc17c 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -2,6 +2,8 @@
   <div class="panel-heading">
     <div class="panel-title clearfix">
       <span class="pull-right">
+      <!-- FIXME ref #819 -->
+      <% if false %>
         <% if user == current_user %>
           <%= link_to( edit_user_registration_path(user), :class => "btn btn-default btn-sm" ) do %>
             <span class="fa fa-pencil"></span>
@@ -10,6 +12,7 @@
         <%= link_to organisation_user_path(user), :method => :delete, :data => {:confirm =>  t('users.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
           <span class="fa fa-trash-o"></span>
         <% end %>
+      <% end %>
       </span>
       <h5>
         <%= link_to( organisation_user_path(user), :class => "preview", :title => "#{User.model_name.human.capitalize} #{user.email}") do %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 94e968ca5..6e1c3d089 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -11,9 +11,12 @@
 </p>
 </div>
 
-<% content_for(:sidebar) do %>
-  <ul class="actions">
-    <li><%= link_to( t('users.actions.edit'), edit_user_registration_path, :class => "edit") if @user == current_user %></li>
-    <li><%= link_to t('users.actions.destroy'), organisation_user_path(@user),:method => :delete, :data => {:confirm => t('users.actions.destroy_confirm')}, :class => "remove" %></li>
-  </ul>
+<!-- FIXME ref #819 -->
+<% if false %>
+  <% content_for(:sidebar) do %>
+    <ul class="actions">
+      <li><%= link_to( t('users.actions.edit'), edit_user_registration_path, :class => "edit") if @user == current_user %></li>
+      <li><%= link_to t('users.actions.destroy'), organisation_user_path(@user),:method => :delete, :data => {:confirm => t('users.actions.destroy_confirm')}, :class => "remove" %></li>
+    </ul>
+  <% end %>
 <% end %>