floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-22 12:45:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'standalone_develop' into pre_trustie_server

Browse Source
This commit is contained in:
yystopf
2023-03-10 16:37:57 +08:00
parent e6f8f57611 f4f8e7e5b6
commit 09e91c443d
139 changed files with 3998 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/admins/organizations/index.html.erb
View File

@@ -1,6 +1,15 @@
<% define_admin_breadcrumbs do %>
<% add_admin_breadcrumb('组织管理', admins_organizations_path) %>
<% end %>
<div class="box search-form-container user-list-form">
<%= form_tag(admins_organizations_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
<%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: 'login/昵称') %>
<%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
<% end %>
</div>
<div class="box admin-list-container organizations-list-container">
<%= render partial: 'admins/organizations/shared/org_list', locals: { organizations: @orgs } %>

2
app/views/admins/organizations/index.js.erb
View File

@@ -1 +1 @@
$('.users-list-container').html("<%= j( render partial: 'admins/organizations/shared/org_list', locals: { organizations: @orgs } ) %>");
$('.organizations-list-container').html("<%= j( render partial: 'admins/organizations/shared/org_list', locals: { organizations: @orgs } ) %>");

16
app/views/admins/organizations/shared/_org_list.html.erb
View File

@@ -1,13 +1,14 @@
<table class="table table-hover users-list-table">
<thead class="thead-light">
<tr>
<th width="4%">序号</th>
<th width="5%">序号</th>
<th width="8%" class="text-left">login</th>
<th width="8%" class="text-left">昵称</th>
<th width="10%"><%= sort_tag('创建于', name: 'created_on', path: admins_organizations_path) %></th>
<th width="10%"><%= sort_tag('最后登录', name: 'last_login_on', path: admins_organizations_path) %></th>
<th width="12%">项目数</th>
<th width="14%">操作</th>
<th width="10%" class="text-left">昵称</th>
<th width="15%"><%= sort_tag('创建于', name: 'created_on', path: admins_organizations_path) %></th>
<th width="8%" >团队</th>
<th width="8%" >成员</th>
<th width="8%">项目数</th>
<th width="10%">操作</th>
</tr>
</thead>
<tbody>
@@ -22,7 +23,8 @@
</td>
<td><%= org.nickname %> </td>
<td><%= display_text(org.created_on&.strftime('%Y-%m-%d %H:%M')) %></td>
<td><%= display_text(org.last_login_on&.strftime('%Y-%m-%d %H:%M')) %></td>
<td><%= link_to org.teams_count, "/#{org.login}", target: "_blank" %></td>
<td><%= link_to org.organization_users_count, "/#{org.login}", target: "_blank" %></td>
<td><%= link_to org.projects_count, "/#{org.login}", target: "_blank" %></td>
<td class="action-container">
<%= link_to '查看', admins_organization_path(org), class: 'action' %>

20
app/views/admins/projects_rank/index.html.erb
View File

@@ -19,15 +19,15 @@
<thead class="thead-light">
<tr>
<th width="20%">排名</th>
<th width="20%">项目</th>
<th width="20%">得分</th>
<th width="20%">访问数</th>
<th width="20%">关注数</th>
<th width="20%">点赞数</th>
<th width="20%">fork数</th>
<th width="20%">疑修数</th>
<th width="20%">合并请求数</th>
<th width="20%">提交数</th>
<th width="30%">项目</th>
<th width="10%">得分</th>
<th width="10%">访问数</th>
<th width="10%">关注数</th>
<th width="10%">点赞数</th>
<th width="10%">fork数</th>
<th width="10%">疑修数</th>
<th width="10%">合并请求数</th>
<th width="10%">提交数</th>
</tr>
</thead>
<tbody>
@@ -38,7 +38,7 @@
<% owner_common = $redis_cache.hgetall("v2-owner-common:#{project_common["owner_id"]}")%>
<td>
<a href="/<%= owner_common["login"] %>/<%= project_common["identifier"]%>">
<%= project_common["name"] %>
<%= "#{owner_common["name"]}/#{project_common["name"]}" %>
</a>
</td>