Abilities extended. Resources security improved

app/views/help/permissions.html.haml

@@ -4,15 +4,17 @@
 %h4 Guest
 %ul
   %li Create new issue
-  %li Create new merge request
+  %li Leave comments
   %li Write on project wall
 
 %h4 Reporter
 %ul
   %li Pull project code
+  %li Download project
   %li Create new issue
   %li Create new merge request
   %li Write on project wall
+  %li Create a code snippets
 
 
 %h4 Developer
@@ -25,6 +27,7 @@
   %li Create new issue
   %li Create new merge request
   %li Write on project wall
+  %li Write a wiki
 
 %h4 Master
 %ul

app/views/issues/_show.html.haml

@@ -1,11 +1,10 @@
 %li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) }
   .right
-    - if can? current_user, :write_issue, issue
+    - if can? current_user, :modify_issue, issue
       - if issue.closed
         = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put,  :class => "btn small", :remote => true
       - else
         = link_to 'Resolve', project_issue_path(issue.project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "success btn small", :remote => true
-    - if can? current_user, :write_issue, issue
       = link_to 'Edit', edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true
     -#- if can?(current_user, :admin_issue, @project) || issue.author == current_user
       = link_to 'Remove', [issue.project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "danger btn small delete-issue", :id => "destroy_issue_#{issue.id}"

app/views/layouts/_project_menu.html.haml

@@ -4,8 +4,9 @@
     Project
 
   - if @project.repo_exists?
-    = link_to "Files", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
-    = link_to "Commits", project_commits_path(@project), :class => commit_tab_class
+    - if can? current_user, :download_code, @project
+      = link_to "Files", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
+      = link_to "Commits", project_commits_path(@project), :class => commit_tab_class
 
     = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
     - if @project.issues_enabled

app/views/merge_requests/show.html.haml

@@ -10,12 +10,11 @@
     = @merge_request.created_at.stamp("Aug 21, 2011")
 
   %span.right
-    - if can?(current_user, :admin_project, @project) || @merge_request.author == current_user
+    - if can?(current_user, :modify_merge_request, @merge_request)
       - if @merge_request.closed
         = link_to 'Reopen', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => false }, :status_only => true), :method => :put,  :class => "btn"
       - else
         = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close merge request"
-    - if can?(current_user, :admin_project, @project) || @merge_request.author == current_user
       = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small" do 
         Edit
 

app/views/widgets/_project_member.html.haml

@@ -11,23 +11,19 @@
   %p 
     - if @project.issues_enabled
       %span
-        Assigned issues:
+        Assigned Issues:
         = current_user.assigned_issues.opened.count
       %br
     - if @project.merge_requests_enabled
       %span
-        Assigned merge request:
-        = current_user.assigned_merge_requests.opened.count
-      %br
-      %span
-        Your merge requests:
+        Assigned Requests:
         = current_user.assigned_merge_requests.opened.count
       %br
     %br
-    - if @project.merge_requests_enabled
+    - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
       = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do 
         Merge Request
-    - if @project.issues_enabled
+    - if @project.issues_enabled && can?(current_user, :write_issue, @project)
       = link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do 
         Issue
 

app/views/wikis/show.html.haml

@@ -4,13 +4,13 @@
     - if can? current_user, :write_wiki, @project
       = link_to history_project_wiki_path(@project, @wiki), :class => "btn small padded" do
         History
-    = link_to edit_project_wiki_path(@project, @wiki), :class => "btn small" do
-      Edit
+      = link_to edit_project_wiki_path(@project, @wiki), :class => "btn small" do
+        Edit
 %hr
 
 = markdown_to_html @wiki.content
 
 %p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at}
-- if can? current_user, :write_wiki, @project
+- if can? current_user, :admin_wiki, @project
   = link_to project_wiki_path(@project, @wiki), :confirm => "Are you sure you want to delete this page?", :method => :delete do
     Delete this page