Browse Source

用户可以查看其他用户的构建列表

tags/v3.0.0
moshenglv 5 years ago
parent
commit
9a66b48726
4 changed files with 15 additions and 4 deletions
  1. +10
    -2
      app/controllers/ci/base_controller.rb
  2. +0
    -1
      app/controllers/ci/builds_controller.rb
  3. +4
    -0
      app/helpers/ci/builds_helper.rb
  4. +1
    -1
      app/views/ci/builds/_build.json.jbuilder

+ 10
- 2
app/controllers/ci/base_controller.rb View File

@@ -50,14 +50,22 @@ class Ci::BaseController < ApplicationController
end

def connect_to_ci_db(options={})
if !(current_user && !current_user.is_a?(AnonymousUser) && !current_user.devops_uninit?)
current = current_user
owner = params[:owner]
if owner
current = User.find_by(login: owner)
end

if !(current && !current.is_a?(AnonymousUser) && !current.devops_uninit?)
return
end
if current_user.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE

if current.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
connect_to_trustie_ci_database(options)
else
connect_to_ci_database(options)
end

end

end

+ 0
- 1
app/controllers/ci/builds_controller.rb View File

@@ -8,7 +8,6 @@ class Ci::BuildsController < Ci::BaseController

def index
@user = current_user
scope = @repo.builds

scope = Ci::Builds::ListQuery.call(@repo, params)



+ 4
- 0
app/helpers/ci/builds_helper.rb View File

@@ -8,4 +8,8 @@ module Ci::BuildsHelper
return nil if end_time == 0 || start_time == 0
game_spend_time(end_time - start_time)
end

def render_build_author login
User.find_by(login: login)
end
end

+ 1
- 1
app/views/ci/builds/_build.json.jbuilder View File

@@ -7,7 +7,7 @@ json.action build.build_action
json.error build.build_error if build.build_status == 'error'
json.message build.build_message
json.author do
json.partial! 'author', user: current_user
json.partial! 'author', user: render_build_author(build.build_author)
end
json.started format_utc_time build.build_started
json.finished format_utc_time build.build_finished


Loading…
Cancel
Save