jro_apps/redmine Commit - r13614:37aa01674039

Added Issue#attributes_editable?...

Jean-Philippe Lang -

r13614:37aa01674039

parent child

Context file:

r13614:37aa01674039

app/controllers/issues_controller.rb 0 -2

                 @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
-                @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @priorities = IssuePriority.active
                 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
                 @relation = IssueRelation.new
               # from the params
               # TODO: Refactor, not everything in here is needed by #edit
               def update_issue_from_params
-                @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
                 if params[:time_entry]
                   @time_entry.attributes = params[:time_entry]

app/models/issue.rb +6 -1

               # Returns true if user or current user is allowed to edit or add a note to the issue
               def editable?(user=User.current)
-                user.allowed_to?(:edit_issues, project) || user.allowed_to?(:add_issue_notes, project)
+                attributes_editable?(user) || user.allowed_to?(:add_issue_notes, project)
+              end
+              # Returns true if user or current user is allowed to edit the issue
+              def attributes_editable?(user=User.current)
+                user.allowed_to?(:edit_issues, project)
               end
               def initialize(attributes=nil, *args)

app/views/issues/_edit.html.erb +1 -1

                 <%= error_messages_for 'issue', 'time_entry' %>
                 <%= render :partial => 'conflict' if @conflict %>
                 <div class="box">
-                <% if @edit_allowed %>
+                <% if @issue.attributes_editable? %>
                     <fieldset class="tabular"><legend><%= l(:label_change_properties) %></legend>
                     <div id="all_attributes">
                     <%= render :partial => 'form', :locals => {:f => f} %>

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages