Browse Source

Merge branch 'dev_trustie' into dev_chain

tags/v1.0.0
sylor_huang@126.com 6 years ago
parent
commit
964e015588
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      app/controllers/pull_requests_controller.rb

+ 1
- 1
app/controllers/pull_requests_controller.rb View File

@@ -174,7 +174,7 @@ class PullRequestsController < ApplicationController
end

def show
@user_permission = current_user.present? && current_user.logged? && (@issue.assigned_to_id == current_user.id || current_user.admin? )
@user_permission = current_user.present? && current_user.logged? && (@issue.assigned_to_id == current_user.id || @project.user_id == current_user.id || @project.manager?(current_user) )
@issue_user = @issue.user
@issue_assign_to = @issue.get_assign_user



Loading…
Cancel
Save