floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into dev_trustie_server

This commit is contained in:
jasder 2021-04-26 16:46:24 +08:00
parent 341a810afc 1a22491e36
commit 09ac49dda5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/organizations/base_controller.rb
View File

@ -17,6 +17,7 @@ class Organizations::BaseController < ApplicationController
end end
def org_privacy_condition def org_privacy_condition
return false if current_user.admin?
@organization.organization_extension.privacy? && @organization.organization_users.where(user_id: current_user.id).blank? @organization.organization_extension.privacy? && @organization.organization_users.where(user_id: current_user.id).blank?
end end

4
app/views/admins/projects/shared/_list.html.erb
View File

@ -23,7 +23,7 @@
<td><%= list_index_no((params[:page] || 1).to_i, index) %></td> <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
<td><%= project.id %></td> <td><%= project.id %></td>
<td class="text-left"> <td class="text-left">
<%= link_to(project.name, "/projects/#{project.id}", target: '_blank') %> <%= link_to(project.name, "/projects/#{project&.owner&.login}/#{project.identifier}", target: '_blank') %>
</td> </td>
<td><%= project.is_public ? '√' : '' %></td> <td><%= project.is_public ? '√' : '' %></td>
<td><%= project.issues.size %></td> <td><%= project.issues.size %></td>
@ -33,7 +33,7 @@
<td><%= project.versions.size %></td> <td><%= project.versions.size %></td>
<td><%= project.members.size %></td> <td><%= project.members.size %></td>
<td> <td>
<%= project.owner ? link_to(project.owner&.real_name, "/users/#{project.owner&.login}", target: '_blank') : "" %> <%= link_to_project(project) %>
</td> </td>
<td><%= project.created_on&.strftime('%Y-%m-%d %H:%M') %></td> <td><%= project.created_on&.strftime('%Y-%m-%d %H:%M') %></td>
<td class="action-container"> <td class="action-container">