Refs #2476 : Disable modification and deletion of resources from another referential; in progress

3 files changed, 28 insertions, 21 deletions

diff --git a/app/views/connection_links/_connection_link.slim b/app/views/connection_links/_connection_link.slim
index cfe84cc53..2ece8ed44 100644
--- a/app/views/connection_links/_connection_link.slim
+++ b/app/views/connection_links/_connection_link.slim
@@ -2,11 +2,13 @@
   .panel-heading
     .panel-title.clearfix
       span.pull-right
-        = link_to edit_referential_connection_link_path(@referential, connection_link), class: 'btn btn-default btn-sm' do
+        - if policy(connection_link).edit?
+          = link_to edit_referential_connection_link_path(@referential, connection_link), class: 'btn btn-default btn-sm' do
           span.fa.fa-pencil
-        
-        = link_to referential_connection_link_path(@referential, connection_link), :method => :delete, :data => {:confirm =>  t('connection_links.actions.destroy_confirm')}, class: 'btn btn-danger btn-sm' do
-          span.fa.fa-trash-o
+
+        - if policy(connection_link).destroy?
+          = link_to referential_connection_link_path(@referential, connection_link), :method => :delete, :data => {:confirm =>  t('connection_links.actions.destroy_confirm')}, class: 'btn btn-danger btn-sm' do
+              span.fa.fa-trash-o
 
       h5
         = link_to([@referential, connection_link], class: 'preview', title: "#{Chouette::ConnectionLink.model_name.human.capitalize} #{connection_link.name}") do
@@ -21,9 +23,9 @@
         = link_to_if connection_link.departure, truncate(connection_link.departure.name, :length => 15) , referential_stop_area_path(@referential, connection_link.departure), :title => "#{connection_link.human_attribute_name('departure')} #{connection_link.departure.name}"
       - else
     	 = connection_link.human_attribute_name('undefined')
-      
+
       = t('.to')
-      
+
       - if connection_link.arrival.present?
         = link_to_if( connection_link.arrival, truncate(connection_link.arrival.name, :length => 15), referential_stop_area_path(@referential, connection_link.arrival), :title => "#{connection_link.human_attribute_name('arrival')} #{connection_link.arrival.name}" )
       - else
@@ -31,4 +33,4 @@
     p
       = connection_link.human_attribute_name('default_duration').capitalize
       = " : "
-      = connection_link.default_duration ? connection_link.default_duration.strftime('%Mm %Ss') : connection_link.human_attribute_name("undefined")
\ No newline at end of file
+      = connection_link.default_duration ? connection_link.default_duration.strftime('%Mm %Ss') : connection_link.human_attribute_name("undefined")
diff --git a/app/views/connection_links/index.html.slim b/app/views/connection_links/index.html.slim
index d36c6a125..7651ae340 100644
--- a/app/views/connection_links/index.html.slim
+++ b/app/views/connection_links/index.html.slim
@@ -20,4 +20,5 @@
 - content_for :sidebar do
   ul.actions
     li
-      = link_to t('connection_links.actions.new'), new_referential_connection_link_path(@referential), class: 'add'
+      - if policy(Chouette::ConnectionLink).create? && @referential.organisation == current_organisation
+        = link_to t('connection_links.actions.new'), new_referential_connection_link_path(@referential), class: 'add'
diff --git a/app/views/connection_links/show.html.slim b/app/views/connection_links/show.html.slim
index 263c4c154..5d8864bb5 100644
--- a/app/views/connection_links/show.html.slim
+++ b/app/views/connection_links/show.html.slim
@@ -2,7 +2,7 @@
 
 .connection_link_show
   = @map.to_html
-  
+
   .summary
     p
       label = "#{@connection_link.human_attribute_name(:departure)} : "
@@ -24,7 +24,7 @@
         = t("unknown")
       - else
         = t("connection_link_types.label.#{@connection_link.connection_link_type}")
-      
+
     p
       label = "#{@connection_link.human_attribute_name('comment')} : "
       = @connection_link.comment
@@ -40,12 +40,12 @@
       label.duration = "#{@connection_link.human_attribute_name('default_duration')} : "
       - if @connection_link.default_duration.present?
         = @connection_link.default_duration.strftime('%Hh %Mm %Ss')
-      
+
     p
       label.duration = "#{@connection_link.human_attribute_name('frequent_traveller_duration')} : "
       - if @connection_link.frequent_traveller_duration.present?
         = @connection_link.frequent_traveller_duration.strftime('%Hh %Mm %Ss')
-      
+
     p
       label.duration = "#{@connection_link.human_attribute_name('occasional_traveller_duration')} : "
       - if @connection_link.occasional_traveller_duration.present?
@@ -79,14 +79,18 @@
 
 - content_for :sidebar do
   ul.actions
-    li
-      = link_to t('connection_links.actions.new'), new_referential_connection_link_path(@referential), class: 'add'
-    li
-      = link_to t('connection_links.actions.edit'), edit_referential_connection_link_path(@referential, @connection_link), class: 'edit'
-    li
-      = link_to t('connection_links.actions.destroy'), referential_connection_link_path(@referential, @connection_link), :method => :delete,  :data => {:confirm =>  t('connection_links.actions.destroy_confirm')}, class: 'remove'
-    li
-      = link_to t('connection_links.actions.select_areas'), select_areas_referential_connection_link_path(@referential, @connection_link), class: 'select'
+    - if policy(Chouette::ConnectionLink).create? && @referential.organisation == current_organisation
+      li
+        = link_to t('connection_links.actions.new'), new_referential_connection_link_path(@referential), class: 'add'
+    - if policy(@connection_link).edit?
+      li
+        = link_to t('connection_links.actions.edit'), edit_referential_connection_link_path(@referential, @connection_link), class: 'edit'
+    - if policy(@connection_link).destroy?
+      li
+        = link_to t('connection_links.actions.destroy'), referential_connection_link_path(@referential, @connection_link), :method => :delete,  :data => {:confirm =>  t('connection_links.actions.destroy_confirm')}, class: 'remove'
+    - if policy(@connection_link).edit?
+      li
+        = link_to t('connection_links.actions.select_areas'), select_areas_referential_connection_link_path(@referential, @connection_link), class: 'select'
     br
 
-  = creation_tag(@connection_link)
\ No newline at end of file
+  = creation_tag(@connection_link)