diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index cbf2c30bb..783e7d323 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -312,7 +312,8 @@ class ApplicationController < ActionController::Base elsif @course allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @course || @courses, :global => global) else - allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global) + # allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global) + allowed = true end allowed end diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb index 1e7ae72df..2de5b6571 100644 --- a/app/views/organizations/_org_subfield_news.html.erb +++ b/app/views/organizations/_org_subfield_news.html.erb @@ -39,7 +39,7 @@
  • <%= link_to( l(:button_edit), - {:action => 'edit', :id => activity}, + {:controller => 'news', :action => 'edit', :id => activity}, :class => 'postOptionLink' ) if activity.author == User.current %>
  • diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb index 2614462d7..457a78b6c 100644 --- a/app/views/projects/_project_news.html.erb +++ b/app/views/projects/_project_news.html.erb @@ -108,7 +108,7 @@
    <%= form_for('new_form',:url => {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%> - +
    diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index 30053f6c6..672b2e2e9 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -44,7 +44,7 @@
  • <%= link_to( l(:button_edit), - {:action => 'edit', :id => activity}, + {controller:'news', :action => 'edit', :id => activity.id}, :class => 'postOptionLink' ) if User.current.allowed_to?(:manage_news, activity.course) %>