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

Merge pull request 'CLA 创建系列' (#56) from KingChan/forgeplus:chenjing into standalone_develop

Browse Source
This commit is contained in:
KingChan
2023-06-13 15:39:15 +08:00
parent b4a5f685be cfaa5301ea
commit 606d6ab621
78 changed files with 682 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,11 +27,12 @@
<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">
<%= javascript_void_link '开通CLA', class: 'action open-cla-action', data: { id: org.id }, style: org.open_cla? ? 'display: none;' : '' %>
<%= javascript_void_link '关闭CLA', class: 'action close-cla-action', data: { id: org.id }, style: org.open_cla? ? '' : 'display: none;' %>
<%= link_to '查看', admins_organization_path(org), class: 'action' %>
<div class="d-inline">
<%= javascript_void_link('更多', class: 'action dropdown-toggle', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) %>
<div class="dropdown-menu more-action-dropdown">
<%= delete_link '删除', admins_organization_path(org, element: ".user-item-#{org.id}"), class: 'dropdown-item delete-user-action' %>
</div>
</div>

3
app/views/admins/organizations/show.html.erb
View File

@@ -29,6 +29,9 @@
<%= f.input :lastname, label: '姓名', wrapper_html: { class: 'col-md-3' }, input_html: { readonly: true, class: 'col-md-11', value: @org.real_name } %>
</div>
<div class="form-row">
<%= f.input :cla, label: '是否开通CLA', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-md-11', value: @org.cla } %>
</div>
</div>
<% end %>

5
app/views/organizations/clas/_detail.json.jbuilder Normal file
View File

@@ -0,0 +1,5 @@
json.id cla.id
json.content cla.content
json.key cla.key
json.name cla.name
json.pr_need cla.pr_need

1
app/views/organizations/clas/create.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "detail", cla: @cla, organization: @organization

4
app/views/organizations/clas/index.json.jbuilder Normal file
View File

@@ -0,0 +1,4 @@
json.id @cla.id
json.key @cla.key
json.name @cla.name
json.pr_need @cla.pr_need

6
app/views/organizations/clas/show.json.jbuilder Normal file
View File

@@ -0,0 +1,6 @@
json.partial! "detail", cla: @cla, organization: @organization
json.is_admin @is_admin
json.is_member @is_member
json.organization do
json.partial! "organizations/organizations/simple", organization: @organization
end

1
app/views/organizations/clas/update.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "detail", cla: @cla, organization: @organization

3
app/views/organizations/organizations/_detail.json.jbuilder
View File

@@ -16,4 +16,5 @@ json.news_banner_id organization.news_banner_id
json.news_content organization.news_content
json.memo organization.memo
json.news_title organization.news_title
json.news_url organization.news_url
json.news_url organization.news_url
json.cla organization.cla

8
app/views/users/clas/_detail.json.jbuilder Normal file
View File

@@ -0,0 +1,8 @@
json.id user_cla.id
json.real_name user_cla.real_name
json.email user_cla.email
json.state user_cla.state
json.created_at format_time(user_cla.created_at)
json.cla do
json.partial! "/organizations/clas/detail", locals: {cla: user_cla.cla}
end

3
app/views/users/clas/index.json.jbuilder Normal file
View File

@@ -0,0 +1,3 @@
json.user_clas @user_clas do |user_cla|
json.partial! "detail", user_cla: user_cla
end

1
app/views/users/clas/show.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "detail", user_cla: @user_cla