<%= text_field_tag('navbar[][name]', nav['name'], id: nil, class: 'form-control') %>
<%= text_field_tag('navbar[][link]', nav['link'], id: nil, class: 'form-control') %>
+ <%= number_field_tag('navbar[][index]', nav['index'].to_i, id: nil, class: 'form-control',min:0,max:99999, title:"请输入正整数 范围 0-99999", pattern:'^\d+')%>
<%= check_box_tag('navbar[][hidden]', 0, !nav['hidden'], id: nil, class: 'font-16') %>
diff --git a/app/views/admins/organizations/index.html.erb b/app/views/admins/organizations/index.html.erb
index 7cd2ba8fa..2444d87f3 100644
--- a/app/views/admins/organizations/index.html.erb
+++ b/app/views/admins/organizations/index.html.erb
@@ -5,6 +5,10 @@
<%= 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/昵称') %>
+
+ 是否签署CLA
+
+ <%= check_box_tag("enabling_cla", true, false, id: "user_enabling_cla", style: 'margin-left: 2px;') %>
<%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
<% end %>
diff --git a/app/views/admins/organizations/shared/_org_list.html.erb b/app/views/admins/organizations/shared/_org_list.html.erb
index 25878b296..148681fb2 100644
--- a/app/views/admins/organizations/shared/_org_list.html.erb
+++ b/app/views/admins/organizations/shared/_org_list.html.erb
@@ -27,11 +27,12 @@
<%= link_to org.organization_users_count, "/#{org.login}", target: "_blank" %>
<%= link_to org.projects_count, "/#{org.login}", target: "_blank" %>
+ <%= 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' %>
<%= javascript_void_link('更多', class: 'action dropdown-toggle', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) %>
diff --git a/app/views/admins/organizations/show.html.erb b/app/views/admins/organizations/show.html.erb
index b40f1c258..501b1b5ad 100644
--- a/app/views/admins/organizations/show.html.erb
+++ b/app/views/admins/organizations/show.html.erb
@@ -28,8 +28,9 @@
<%= f.input :lastname, label: '姓名', wrapper_html: { class: 'col-md-3' }, input_html: { readonly: true, class: 'col-md-11', value: @org.real_name } %>
-
-
+
+ <%= f.input :enabling_cla, as: :boolean, label: '开通CLA', checked_value: 1, unchecked_value: 0 %>
+
<% end %>
组织项目
diff --git a/app/views/admins/page_themes/_form_modal.html.erb b/app/views/admins/page_themes/_form_modal.html.erb
new file mode 100644
index 000000000..3d0a97588
--- /dev/null
+++ b/app/views/admins/page_themes/_form_modal.html.erb
@@ -0,0 +1,60 @@
+
+
+
+
+ <%= form_for @page_theme, url: {controller: "page_themes", action: "#{type}"}, html: { enctype: 'multipart/form-data' } do |p| %>
+
+ <% if type == "create"%>
+
+
+ 建站工具 *
+
+ <% state_options = [['hugo', "hugo"], ['jeklly', "jeklly"],['hexo',"hexo"]] %>
+ <%= select_tag('page_theme[language_frame]', options_for_select(state_options), class: 'form-control') %>
+
+ <% end%>
+
+
+ 主题名 *
+
+ <%= p.text_field :name, class: "form-control input-lg",required: true, maxlength: 100, size: 100 %>
+
+
+
+ 仓库url *
+
+ <%= p.text_field :clone_url, class: "form-control",placeholder: "https://gitlink.org.cn/XXXX/xxxx.git",required: true, pattern: "https://gitlink.org.cn/.*"%>
+
+
+
+
+ 排序等级
+
+ <%= p.number_field :order_index, class: "form-control",placeholder: ""%>
+
+
+ <% logo_img = @page_theme.image %>
+
+
+ <%= file_field_tag(:image, accept: 'image/png,image/jpg,image/jpeg',style: "display: none", value: params[:image]) %>
+
+
+
+
logo *
+
格式：PNG、JPG、JPEG、SVG
+
+
+
+
+ <% end %>
+
+
+
+
+
+ 序号
+ 建站工具
+ 顺序
+ 主题名
+ 图片
+ 仓库url
+ 操作
+
+
+
+ <% if page_themes.present? %>
+ <% page_themes.each_with_index do |theme, index| %>
+
+ <%= list_index_no((params[:page] || 1).to_i, index) %>
+ <%= theme.language_frame %>
+ <%= theme.order_index %>
+ <%= theme.name %>
+ <%= theme.clone_url %>
+ <%= link_to "编辑", edit_admins_page_theme_path(theme), remote: true, class: "action" %>
+ <%= link_to "删除", admins_page_theme_path(theme), method: :delete, data:{confirm: "确认删除的吗？"}, class: "action" %>
+
+
+ <% end %>
+ <% else %>
+ <%= render 'admins/shared/no_data_for_table' %>
+ <% end %>
+
+
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: page_themes } %>
\ No newline at end of file
diff --git a/app/views/admins/page_themes/edit.js.erb b/app/views/admins/page_themes/edit.js.erb
new file mode 100644
index 000000000..a9f963c5d
--- /dev/null
+++ b/app/views/admins/page_themes/edit.js.erb
@@ -0,0 +1,18 @@
+$("#page-themes-modals").html("<%= j render(partial: 'admins/page_themes/form_modal', locals: {type: 'update'}) %>")
+$(".page-themes-change-modal").modal('show');
+
+$('.logo-item-left').on("change", 'input[type="file"]', function () {
+ var $fileInput = $(this);
+ var file = this.files[0];
+ var imageType = /image.*/;
+ if (file && file.type.match(imageType)) {
+ var reader = new FileReader();
+ reader.onload = function () {
+ var $box = $fileInput.parent();
+ $box.find('img').attr('src', reader.result).css('display', 'block');
+ $box.addClass('has-img');
+ };
+ reader.readAsDataURL(file);
+ } else {
+ }
+});
diff --git a/app/views/admins/page_themes/index.html.erb b/app/views/admins/page_themes/index.html.erb
new file mode 100644
index 000000000..4b4392d88
--- /dev/null
+++ b/app/views/admins/page_themes/index.html.erb
@@ -0,0 +1,21 @@
+<% define_admin_breadcrumbs do %>
+ <% add_admin_breadcrumb('站点主题配置') %>
+<% end %>
+
+
+
+
+ <%= render partial: 'admins/page_themes/list', locals: { page_themes: @page_themes } %>
+
+
+
diff --git a/app/views/admins/page_themes/index.js.erb b/app/views/admins/page_themes/index.js.erb
new file mode 100644
index 000000000..30ea36a4e
--- /dev/null
+++ b/app/views/admins/page_themes/index.js.erb
@@ -0,0 +1 @@
+$('.page-themes-list-container').html("<%= j( render partial: 'admins/page_themes/list', locals: { page_themes: @page_themes } ) %>");
\ No newline at end of file
diff --git a/app/views/admins/page_themes/new.js.erb b/app/views/admins/page_themes/new.js.erb
new file mode 100644
index 000000000..4c3d847d4
--- /dev/null
+++ b/app/views/admins/page_themes/new.js.erb
@@ -0,0 +1,18 @@
+$("#page-themes-modals").html("<%= j render(partial: 'admins/page_themes/form_modal', locals: {type: 'create'}) %>")
+$(".page-themes-change-modal").modal('show');
+
+$('.logo-item-left').on("change", 'input[type="file"]', function () {
+ var $fileInput = $(this);
+ var file = this.files[0];
+ var imageType = /image.*/;
+ if (file && file.type.match(imageType)) {
+ var reader = new FileReader();
+ reader.onload = function () {
+ var $box = $fileInput.parent();
+ $box.find('img').attr('src', reader.result).css('display', 'block');
+ $box.addClass('has-img');
+ };
+ reader.readAsDataURL(file);
+ } else {
+ }
+});
diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb
index fc2fe6068..813e2338d 100644
--- a/app/views/admins/shared/_sidebar.html.erb
+++ b/app/views/admins/shared/_sidebar.html.erb
@@ -24,6 +24,16 @@
<%= sidebar_item_group('#user-submenu', '用户', icon: 'user') do %>
<%= sidebar_item(admins_users_path, '用户列表', icon: 'user', controller: 'admins-users') %>
<%= sidebar_item(admins_organizations_path, '组织列表', icon: 'user', controller: 'admins-organizations') %>
+
+ <% end %>
+
+
+
+ <%= sidebar_item_group('#pages-submenu', '站点管理', icon: 'cogs') do %>
+ <%= sidebar_item(admins_identity_verifications_path, '身份审核列表', icon: 'user', controller: 'admins-identity_verifications') %>
+ <%= sidebar_item(admins_site_pages_path, '用户站点列表', icon: 'sitemap', controller: 'admins-site_pages') %>
+ <%= sidebar_item(admins_page_themes_path, '站点主题配置', icon: 'cogs', controller: 'admins-page_themes') %>
+
<% end %>
@@ -57,6 +67,7 @@
<%= sidebar_item(EduSetting.get("glcc_apply_informations_admin_url"), '报名列表', icon: 'user', controller: 'root') %>
<% end %>
+ <%= sidebar_item(admins_glcc_pr_check_index_path, '考核PR检测', icon: 'edit', controller: 'admins-glcc_pr_check') %>
<% end %>
diff --git a/app/views/admins/site_pages/edit.html.erb b/app/views/admins/site_pages/edit.html.erb
new file mode 100644
index 000000000..a6cf322b3
--- /dev/null
+++ b/app/views/admins/site_pages/edit.html.erb
@@ -0,0 +1,99 @@
+<%
+ define_admin_breadcrumbs do
+ add_admin_breadcrumb('用户站点列表', admins_site_pages_path)
+ add_admin_breadcrumb('站点详情')
+ end
+%>
+
+
+
+ <%= link_to "/#{@site_page.user.login}", class: 'user-info-avatar col-md-1', target: '_blank', data: { toggle: 'tooltip', title: '个人中心' } do %>
+
+ <% end %>
+
+
+
<%= @user.real_name %> | <%= @user.id %> | <%= @user.login %>
+
+
+ <% if @user.authentication? %>
+
+
最近登录：<%= @user.last_login_on&.strftime('%Y-%m-%d %H:%M') %>
+
+
+
+ <%= simple_form_for(@site_page, url: admins_site_page_path(@site_page)) do |f| %>
+
+
+
+
当前用户的站点权限为： <%=@site_page.user.website_permission == true ? "正常" : "关闭，已被管理员强制关闭建站权限" %>
+
当前站点状态为： <%=@site_page.state == true ? "正常" : "关闭，关闭理由为：#{@site_page.state_description}" %>
+
+ <%= f.input :identifier, label: '站点标识', wrapper_html: { class: 'col-md-3' }, input_html: { readonly: true, class: 'col-md-5' , value: @site_page.identifier } %>
+
+
+
+ <%= f.input :site_name, label: '站点名', wrapper_html: { class: 'col-md-3' }, input_html: { readonly: true, class: 'col-md-5' , value: @site_page.site_name } %>
+
+
+
+ <%= f.input :language_frame, label: '建站工具', wrapper_html: { class: 'col-md-3' }, input_html: { readonly: true, type:'text', class: 'col-md-5' , value: @site_page.language_frame } %>
+
+
+
+ <%= f.input :theme, label: '主题', wrapper_html: { class: 'col-md-3' }, input_html: { readonly: true, class: 'col-md-5' , value: @site_page.theme } %>
+
+
+
+
+
+
+
+ 是否关闭站点？
+ <%= f.radio_button :state, 'false' %> 关闭
+
+
+
+ 注意，因为关闭站点涉及操作另外一台服务器，所以站点关闭后无法重新打开 ，请谨慎操作, 关闭站点后该仓库再也不能进行 开通站点、部署等 操作
+
+
+
+ <%= f.input :state_description, as: :text,label: '关闭理由，如需关闭 理由不能为空', wrapper_html: { class: 'col-md-12' }, input_html: { maxlength: 100, size: 40, class: 'col-md-11' , value: @site_page.state_description } %>
+
+
+
+ <%= f.button :submit, value: '保存', class: 'btn-primary mr-3 px-4' %>
+ <%= link_to '取消', admins_site_pages_path, class: 'btn btn-secondary px-4' %>
+
+
+
+ <% end %>
+
+ <%= render partial: 'admins/site_pages/shared/info_list', locals: { site_pages: @site_pages } %>
+
+
diff --git a/app/views/admins/site_pages/index.js.erb b/app/views/admins/site_pages/index.js.erb
new file mode 100644
index 000000000..a2a0b3bac
--- /dev/null
+++ b/app/views/admins/site_pages/index.js.erb
@@ -0,0 +1 @@
+$('.identity-site-pages-list-container').html("<%= j( render partial: 'admins/site_pages/shared/info_list', locals: { site_pages: @site_pages } ) %>");
\ No newline at end of file
diff --git a/app/views/admins/site_pages/shared/_info_list.html.erb b/app/views/admins/site_pages/shared/_info_list.html.erb
new file mode 100644
index 000000000..49143d3f5
--- /dev/null
+++ b/app/views/admins/site_pages/shared/_info_list.html.erb
@@ -0,0 +1,62 @@
+
+
+
+ 序号
+ 昵称
+ 仓库
+ 站点状态
+ 站点名
+ 站点标识
+ 站点地址
+
+ 建站工具
+ 主题
+ 上次部署时间
+
+
+ <%= sort_tag('创建于', name: 'created_at', path: admins_site_pages_path) %>
+ 操作
+
+
+
+ <% if site_pages.present? %>
+ <% site_pages.each_with_index do |site_page, index| %>
+
+ <%= list_index_no((params[:page] || 1).to_i, index) %>
+
+ <%= link_to "/#{site_page.user.login}", target: '_blank' do %>
+ <%= overflow_hidden_span site_page.user.real_name, width: 100 %>
+ <% end %>
+
+
+ <%= link_to "/#{site_page.user.login}/#{site_page.project.try(:identifier)}", target: '_blank' do %>
+ <%= overflow_hidden_span site_page.project.try(:name), width: 100 %>
+ <% end %>
+
+ <%= display_text(site_page.state == true ? "正常" : "已关闭") %>
+ <%= display_text(site_page.site_name) %>
+ <%= display_text(site_page.identifier) %>
+
+ <%= link_to "#{site_page.url}", target: '_blank' do %>
+ <%= overflow_hidden_span site_page.url, width: 120 %>
+ <% end %>
+
+ <%= display_text(site_page.language_frame) %>
+ <%= display_text(site_page.theme) %>
+ <%= display_text(site_page.last_build_at&.strftime('%Y-%m-%d %H:%M')) %>
+
+ <%= display_text(site_page.created_at&.strftime('%Y-%m-%d %H:%M')) %>
+
+
+ <%= link_to "查看", edit_admins_site_page_path(site_page), class: 'action' %>
+ <%= link_to "删除", admins_site_page_path(site_page), method: :delete, data:{confirm: "确认删除吗，删除后站点将无法访问？"}, class: "action" %>
+
+
+ <% end %>
+ <% else %>
+ <%= render 'admins/shared/no_data_for_table' %>
+ <% end %>
+
+
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: site_pages } %>
diff --git a/app/views/admins/users/edit.html.erb b/app/views/admins/users/edit.html.erb
index b407cbbe7..be952e7cb 100644
--- a/app/views/admins/users/edit.html.erb
+++ b/app/views/admins/users/edit.html.erb
@@ -92,8 +92,15 @@
<% end %>
-
-
+
+ <% if @user.id_card_verify %>
+
+ <% end %>
<%= f.input :password, as: :password, label: '修改密码', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11', autocomplete: 'new-password' } %>
<%= f.input :password_confirmation, as: :password, label: '确认密码', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11', autocomplete: 'new-password' } %>
@@ -101,7 +108,7 @@
- <%= f.button :submit, value: '保存', class: 'btn-primary mr-3 px-4' %>
+ <%= f.button :submit, value: '保存', class: 'btn-primary mr-3 px-4 action' ,data:{confirm: "确认更改？"}%>
<%= link_to '取消', admins_users_path, class: 'btn btn-secondary px-4' %>
<% end %>
diff --git a/app/views/compare/show.json.jbuilder b/app/views/compare/show.json.jbuilder
index 26a7cb769..135537cda 100644
--- a/app/views/compare/show.json.jbuilder
+++ b/app/views/compare/show.json.jbuilder
@@ -1,19 +1,21 @@
json.commits_count @compare_result['CommitsCount']
# json.commits @compare_result['Commits'], partial: 'pull_requests/commit', as: :commit
json.commits do
- json.array! @compare_result['Commits'][@page_offset...(@page_offset + @page_limit)] do |commit|
- json.author do
- json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
- end
+ if @compare_result['Commits'].present?
+ json.array! @compare_result['Commits'][@page_offset...(@page_offset + @page_limit)] do |commit|
+ json.author do
+ json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
+ end
- json.committer do
- json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
+ json.committer do
+ json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
+ end
+ json.timestamp render_unix_time(commit['Committer']['When'])
+ json.time_from_now time_from_now(commit['Committer']['When'])
+ json.created_at render_format_time_with_date(commit['Committer']['When'])
+ json.message commit['CommitMessage']
+ json.sha commit['Sha']
end
- json.timestamp render_unix_time(commit['Committer']['When'])
- json.time_from_now time_from_now(commit['Committer']['When'])
- json.created_at render_format_time_with_date(commit['Committer']['When'])
- json.message commit['CommitMessage']
- json.sha commit['Sha']
end
end
diff --git a/app/views/identity_verifications/_info.json.jbuilder b/app/views/identity_verifications/_info.json.jbuilder
new file mode 100644
index 000000000..8235bafa6
--- /dev/null
+++ b/app/views/identity_verifications/_info.json.jbuilder
@@ -0,0 +1,10 @@
+json.id id_verify.id
+json.number id_verify.number
+json.name id_verify.name
+json.card_front id_verify.card_front
+json.card_back id_verify.card_back
+json.hold_card_front id_verify.hold_card_front
+json.hold_card_back id_verify.hold_card_back
+json.state id_verify.state
+json.description id_verify.description
+json.created_at id_verify.created_at.strftime("%Y-%m-%d %H:%M")
diff --git a/app/views/identity_verifications/create.json.jbuilder b/app/views/identity_verifications/create.json.jbuilder
new file mode 100644
index 000000000..400230393
--- /dev/null
+++ b/app/views/identity_verifications/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'info', locals: {id_verify: @id_verify}
\ No newline at end of file
diff --git a/app/views/identity_verifications/index.json.jbuilder b/app/views/identity_verifications/index.json.jbuilder
new file mode 100644
index 000000000..400230393
--- /dev/null
+++ b/app/views/identity_verifications/index.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'info', locals: {id_verify: @id_verify}
\ No newline at end of file
diff --git a/app/views/identity_verifications/update.json.jbuilder b/app/views/identity_verifications/update.json.jbuilder
new file mode 100644
index 000000000..400230393
--- /dev/null
+++ b/app/views/identity_verifications/update.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'info', locals: {id_verify: @id_verify}
\ No newline at end of file
diff --git a/app/views/organizations/clas/_detail.json.jbuilder b/app/views/organizations/clas/_detail.json.jbuilder
new file mode 100644
index 000000000..b9d50183b
--- /dev/null
+++ b/app/views/organizations/clas/_detail.json.jbuilder
@@ -0,0 +1,6 @@
+json.id cla.id
+json.content cla.content
+json.key cla.key
+json.name cla.name
+json.pr_need cla.pr_need
+json.count cla.count
\ No newline at end of file
diff --git a/app/views/organizations/clas/create.json.jbuilder b/app/views/organizations/clas/create.json.jbuilder
new file mode 100644
index 000000000..e95312d8c
--- /dev/null
+++ b/app/views/organizations/clas/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "detail", cla: @cla, organization: @organization
\ No newline at end of file
diff --git a/app/views/organizations/clas/index.json.jbuilder b/app/views/organizations/clas/index.json.jbuilder
new file mode 100644
index 000000000..632fde017
--- /dev/null
+++ b/app/views/organizations/clas/index.json.jbuilder
@@ -0,0 +1,3 @@
+if @cla.present?
+ json.partial! "detail", cla: @cla
+end
\ No newline at end of file
diff --git a/app/views/organizations/clas/show.json.jbuilder b/app/views/organizations/clas/show.json.jbuilder
new file mode 100644
index 000000000..8c55f38e2
--- /dev/null
+++ b/app/views/organizations/clas/show.json.jbuilder
@@ -0,0 +1,8 @@
+json.partial! "detail", cla: @cla, organization: @organization
+json.is_admin @is_admin
+json.is_sign @is_sign
+json.cla_sign_email @cla_sign_email
+json.is_member @is_member
+json.organization do
+ json.partial! "organizations/organizations/simple", organization: @organization
+end
\ No newline at end of file
diff --git a/app/views/organizations/clas/update.json.jbuilder b/app/views/organizations/clas/update.json.jbuilder
new file mode 100644
index 000000000..e95312d8c
--- /dev/null
+++ b/app/views/organizations/clas/update.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "detail", cla: @cla, organization: @organization
\ No newline at end of file
diff --git a/app/views/organizations/organizations/_detail.json.jbuilder b/app/views/organizations/organizations/_detail.json.jbuilder
index c7614f039..1968e78c8 100644
--- a/app/views/organizations/organizations/_detail.json.jbuilder
+++ b/app/views/organizations/organizations/_detail.json.jbuilder
@@ -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
\ No newline at end of file
+json.news_url organization.news_url
+json.enabling_cla organization.enabling_cla
\ No newline at end of file
diff --git a/app/views/projects/_detail.json.jbuilder b/app/views/projects/_detail.json.jbuilder
index ed23fdef2..58cdbcc0c 100644
--- a/app/views/projects/_detail.json.jbuilder
+++ b/app/views/projects/_detail.json.jbuilder
@@ -3,6 +3,7 @@ json.identifier project.identifier
json.name project.name
json.description project.description
json.is_public project.is_public
+json.pr_need project.owner.class == User ? false : project.owner&.cla.try(:pr_need)
json.owner do
json.partial! "/users/user_simple", locals: {user: project.owner}
end
\ No newline at end of file
diff --git a/app/views/pull_requests/_merge_item.json.jbuilder b/app/views/pull_requests/_merge_item.json.jbuilder
index 0db17e265..202530c0b 100644
--- a/app/views/pull_requests/_merge_item.json.jbuilder
+++ b/app/views/pull_requests/_merge_item.json.jbuilder
@@ -4,6 +4,7 @@ json.issue_versions @project_versions
json.issue_priories @project_priories
json.project_author @project.owner.try(:show_real_name)
json.project_name @project.try(:name)
+json.disable_pr_vew @project.pr_view_admin? && !@project.manager?(current_user)
json.members do
json.array! @project_members.to_a.each do |user|
json.id user.id
diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder
index f231e5796..07c4b322b 100644
--- a/app/views/pull_requests/index.json.jbuilder
+++ b/app/views/pull_requests/index.json.jbuilder
@@ -10,6 +10,8 @@ json.project_name @project.name
json.project_author @project.owner.try(:login)
json.project_author_name @project.owner.try(:show_real_name)
json.has_created_pull_requests @project.pull_requests.size > 0
+json.disable_pr_vew @project.pr_view_admin? && !@project.manager?(current_user)
+json.pr_need @project.owner.class == User ? false : @project.owner&.cla.try(:pr_need)
json.issues do
json.array! @issues.to_a do |issue|
@@ -21,10 +23,10 @@ json.issues do
json.pull_request_base pr.base
json.pull_request_staus pr.status == 1 ? "merged" : (pr.status == 2 ? "closed" : "open")
json.is_original pr.is_original
- json.fork_project_id pr&.fork_project_id
- json.fork_project_identifier pr&.fork_project&.identifier
- json.fork_project_user pr&.fork_project&.owner.try(:login)
- json.fork_project_user_name pr&.fork_project&.owner.try(:show_real_name)
+ json.fork_project_id pr.fork_project_id.present? ? pr.fork_project_id : pr.project_id
+ json.fork_project_identifier pr.fork_project_id.present? ? pr&.fork_project&.identifier : pr.project&.identifier
+ json.fork_project_user pr.fork_project_id.present? ? pr&.fork_project&.owner.try(:login) : pr.project&.owner.try(:login)
+ json.fork_project_user_name pr.fork_project_id.present? ? pr&.fork_project&.owner.try(:show_real_name) : pr.project&.owner.try(:show_real_name)
json.reviewers pr.reviewers.pluck(:login)
json.id issue.id
diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder
index 71f0641b6..4c731b9ac 100644
--- a/app/views/pull_requests/show.json.jbuilder
+++ b/app/views/pull_requests/show.json.jbuilder
@@ -23,10 +23,11 @@ if @last_review.present?
end
json.pull_request do
- json.extract! @pull_request, :id,:base, :head, :status,:fork_project_id, :is_original
+ json.extract! @pull_request, :id,:base, :head, :status, :is_original
json.pull_request_staus @pull_request.status == 1 ? "merged" : (@pull_request.status == 2 ? "closed" : "open")
- json.fork_project_user @pull_request&.fork_project&.owner.try(:login)
- json.fork_project_user_name @pull_request&.fork_project&.owner.try(:show_real_name)
+ json.fork_project_id @pull_request.fork_project_id.present? ? @pull_request.fork_project_id : @pull_request.project_id
+ json.fork_project_user @pull_request.fork_project_id.present? ? @pull_request&.fork_project&.owner.try(:login) : @pull_request.project&.owner.try(:login)
+ json.fork_project_user_name @pull_request.fork_project_id.present? ? @pull_request&.fork_project&.owner.try(:show_real_name) : @pull_request.project&.owner.try(:show_real_name)
json.create_user @pull_request&.user&.login
json.mergeable @gitea_pull["mergeable"]
json.state @gitea_pull["state"]
diff --git a/app/views/repositories/_contributor.json.jbuilder b/app/views/repositories/_contributor.json.jbuilder
index b0547eba3..861efb8bb 100644
--- a/app/views/repositories/_contributor.json.jbuilder
+++ b/app/views/repositories/_contributor.json.jbuilder
@@ -1,20 +1,33 @@
-user = $redis_cache.hgetall("v2-owner-common:#{contributor["name"] || contributor["login"]}-#{contributor["email"]}")
-if user.blank?
+user = render_cache_commit_author(contributor)
+if user.present?
+ if user.is_a?(Hash)
+ json.contributions contributor["commits"] || contributor["contributions"]
+ json.id user["id"]
+ json.login user["login"]
+ json.email user["email"]
+ json.type user["type"]
+ json.name (user["name"] || contributor["name"] || contributor["login"]).to_s.downcase
+ json.image_url user["avatar_url"]
+ db_user = User.find_by_id(user["id"])
+ json.contribution_perc db_user.simple_contribution_perc(project, contributor["contribution_perc"]) if db_user.present?
+ else
+ json.contributions contributor["commits"] || contributor["contributions"]
+ json.id user.id
+ json.login user.login
+ json.email user.mail
+ json.type user.type
+ json.name (user["name"] || contributor["name"] || contributor["login"]).to_s.downcase
+ json.image_url url_to_avatar(user)
+ json.contribution_perc user.simple_contribution_perc(project, contributor["contribution_perc"]) if user.present?
+ end
+else
json.contributions contributor["commits"] || contributor["contributions"]
+ json.id nil
json.login nil
json.type nil
json.name (contributor["name"] || contributor["login"]).to_s.downcase
json.email contributor["email"]
json.image_url User::Avatar.get_letter_avatar_url(contributor["name"] || contributor["login"])
json.contribution_perc User.new(login: (contributor["name"] || contributor["login"]), mail: contributor["email"]).simple_contribution_perc(project, contributor["contribution_perc"])
-else
- json.contributions contributor["commits"] || contributor["contributions"]
- json.id user["id"]
- json.login user["login"]
- json.email user["email"]
- json.type user["type"]
- json.name (user["name"] || contributor["name"] || contributor["login"]).to_s.downcase
- json.image_url user["avatar_url"]
- db_user = User.find_by_id(user["id"])
- json.contribution_perc db_user.simple_contribution_perc(project, contributor["contribution_perc"]) if db_user.present?
end
+
diff --git a/app/views/repositories/_simple_entry.json.jbuilder b/app/views/repositories/_simple_entry.json.jbuilder
index 9ad5e3fc2..56b75c198 100644
--- a/app/views/repositories/_simple_entry.json.jbuilder
+++ b/app/views/repositories/_simple_entry.json.jbuilder
@@ -2,7 +2,8 @@ if @project.forge?
is_dir = @sub_entries.is_a?(Array)
file_name = entry['name']
file_type = file_name.starts_with?('.') ? file_name[1..-1] : File.extname(file_name.to_s)[1..-1]
- direct_download = %w(makefile dockerfile readme).exclude?(file_name.to_s.downcase) && download_type(file_type)
+ # direct_download = %w(makefile dockerfile readme).exclude?(file_name.to_s.downcase) && download_type(file_type)
+ direct_download = entry['is_text_file'] == true ? false : true
image_type = image_type?(file_type)
json.name file_name
json.sha entry['sha']
diff --git a/app/views/repositories/edit.json.jbuilder b/app/views/repositories/edit.json.jbuilder
index e0b601f6d..7ef3c9081 100644
--- a/app/views/repositories/edit.json.jbuilder
+++ b/app/views/repositories/edit.json.jbuilder
@@ -10,7 +10,8 @@ json.project_units @project.project_units.pluck(:unit_type)
json.lesson_url @project.lesson_url
json.permission render_permission(current_user, @project)
json.is_transfering @project.is_transfering
-json.transfer do
+json.pr_view_admin @project.pr_view_admin?
+json.transfer do
json.partial! "/users/user_simple", locals: {user: @project&.applied_transfer_project&.owner}
end
json.is_pinned @project.has_pinned_users.include?(current_user)
\ No newline at end of file
diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder
index be79dc594..1027be670 100644
--- a/app/views/settings/show.json.jbuilder
+++ b/app/views/settings/show.json.jbuilder
@@ -32,6 +32,7 @@ json.setting do
json.nav_logo_url default_setting.nav_logo_url&.[](1..-1)
json.login_logo_url default_setting.login_logo_url&.[](1..-1)
json.tab_logo_url default_setting.tab_logo_url&.[](1..-1)
+ json.site_page_deploy_domain @deploy_domain
json.subject_banner_url default_setting.subject_banner_url&.[](1..-1)
json.course_banner_url default_setting.course_banner_url&.[](1..-1)
diff --git a/app/views/site_pages/_info.json.jbuilder b/app/views/site_pages/_info.json.jbuilder
new file mode 100644
index 000000000..bfd2e1171
--- /dev/null
+++ b/app/views/site_pages/_info.json.jbuilder
@@ -0,0 +1,16 @@
+json.id page.id
+json.identifier page.identifier
+json.owner page.user.login
+json.repo page.project.identifier
+json.user_id page.user_id
+json.project_id page.project_id
+json.site_name page.site_name
+json.theme page.theme
+json.state page.state
+json.state_description page.state_description
+json.language_frame page.language_frame
+json.build_state page.build_state
+json.last_build_info page.last_build_info.to_s.split("\n")
+json.url page.url
+json.created_at page.created_at.strftime("%Y-%m-%d %H:%M:%S")
+json.last_build_at page.last_build_at.nil? ? nil : page.last_build_at.strftime("%Y-%m-%d %H:%M:%S")
\ No newline at end of file
diff --git a/app/views/site_pages/create.json.jbuilder b/app/views/site_pages/create.json.jbuilder
new file mode 100644
index 000000000..b706f67b8
--- /dev/null
+++ b/app/views/site_pages/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "info", page: @page
\ No newline at end of file
diff --git a/app/views/site_pages/index.json.jbuilder b/app/views/site_pages/index.json.jbuilder
new file mode 100644
index 000000000..482a7c70c
--- /dev/null
+++ b/app/views/site_pages/index.json.jbuilder
@@ -0,0 +1,4 @@
+json.total_count @total_count
+json.pages @pages.each do |page|
+ json.partial! 'info', locals: {page: page}
+end
diff --git a/app/views/site_pages/show.json.jbuilder b/app/views/site_pages/show.json.jbuilder
new file mode 100644
index 000000000..3b89bc90f
--- /dev/null
+++ b/app/views/site_pages/show.json.jbuilder
@@ -0,0 +1,6 @@
+json.status 0
+json.message "success"
+json.data {
+ json.partial! 'info', locals: {page: @page}
+}
+
diff --git a/app/views/site_pages/themes.json.jbuilder b/app/views/site_pages/themes.json.jbuilder
new file mode 100644
index 000000000..25a1d7015
--- /dev/null
+++ b/app/views/site_pages/themes.json.jbuilder
@@ -0,0 +1,10 @@
+json.total_count @themes.size
+json.themes @themes.map{|e|
+ {
+ name: e.name,
+ language_frame: e.language_frame,
+ image: e.image,
+ clone_url: e.clone_url,
+ order_index: e.order_index,
+ }
+}
diff --git a/app/views/topics/_activity_forum.json.jbuilder b/app/views/topics/_activity_forum.json.jbuilder
index cd624ba76..c1d81f87c 100644
--- a/app/views/topics/_activity_forum.json.jbuilder
+++ b/app/views/topics/_activity_forum.json.jbuilder
@@ -1,4 +1,5 @@
json.(activity_forum, :id, :title, :url)
-request_memo = Forum::Memos::GetService.call(activity_forum&.uuid)
-json.visits request_memo.nil? ? 0 : request_memo["memo"]["viewed_count"]
-json.created_time request_memo.nil? ? format_time(Time.now) : request_memo["memo"]["published_time"]
\ No newline at end of file
+data = activity_forum.get_visitor_data
+json.visits data[:visits]
+json.created_time data[:created_time]
+json.from data[:from]
\ No newline at end of file
diff --git a/app/views/topics/_experience_forum.json.jbuilder b/app/views/topics/_experience_forum.json.jbuilder
index c65a00ef8..414990236 100644
--- a/app/views/topics/_experience_forum.json.jbuilder
+++ b/app/views/topics/_experience_forum.json.jbuilder
@@ -1,4 +1,5 @@
json.(experience_forum, :id, :title, :url)
-request_memo = Forum::Memos::GetService.call(experience_forum&.uuid)
-json.visits request_memo.nil? ? 0 : request_memo["memo"]["viewed_count"]
-json.created_time request_memo.nil? ? format_time(Time.now) : request_memo["memo"]["published_time"]
\ No newline at end of file
+data = experience_forum.get_visitor_data
+json.visits data[:visits]
+json.created_time data[:created_time]
+json.from data[:from]
\ No newline at end of file
diff --git a/app/views/topics/_glcc_news.json.jbuilder b/app/views/topics/_glcc_news.json.jbuilder
index 0147aff3f..6c1227429 100644
--- a/app/views/topics/_glcc_news.json.jbuilder
+++ b/app/views/topics/_glcc_news.json.jbuilder
@@ -1,4 +1,5 @@
json.(glcc_news, :id, :title, :url, :uuid)
-request_memo = Forum::Memos::GetService.call(glcc_news&.uuid)
-json.visits request_memo.nil? ? 0 : request_memo["memo"]["viewed_count"]
-json.created_time request_memo.nil? ? format_time(Time.now) : request_memo["memo"]["published_time"]
\ No newline at end of file
+data = glcc_news.get_visitor_data
+json.visits data[:visits]
+json.created_time data[:created_time]
+json.from data[:from]
\ No newline at end of file
diff --git a/app/views/topics/_pinned_forum.json.jbuilder b/app/views/topics/_pinned_forum.json.jbuilder
index 3d5adce26..db250e55c 100644
--- a/app/views/topics/_pinned_forum.json.jbuilder
+++ b/app/views/topics/_pinned_forum.json.jbuilder
@@ -1,4 +1,5 @@
json.(pinned_forum, :id, :title, :url)
-request_memo = Forum::Memos::GetService.call(pinned_forum&.uuid)
-json.visits request_memo.nil? ? 0 : request_memo["memo"]["viewed_count"]
-json.created_time request_memo.nil? ? format_time(Time.now) : request_memo["memo"]["published_time"]
\ No newline at end of file
+data = pinned_forum.get_visitor_data
+json.visits data[:visits]
+json.created_time data[:created_time]
+json.from data[:from]
\ No newline at end of file
diff --git a/app/views/user_mailer/glcc_pr_check_email.html.erb b/app/views/user_mailer/glcc_pr_check_email.html.erb
new file mode 100644
index 000000000..aa01d45bf
--- /dev/null
+++ b/app/views/user_mailer/glcc_pr_check_email.html.erb
@@ -0,0 +1,71 @@
+
+
+
+ 验证码发送
+
+
+
+
+
+
+
+
+
+
+
+ 尊敬的<%=@name%>同学：
+
+
+
+ 您好！经过一个多月的开发，GLCC开源编程夏令营终于迎来中期考核。为了确保您能够顺利通过考核，现对您提交的PR链接进行检测，发现存在以下问题：
+
+
+
+ <%=@content.html_safe%>
+
+
+
+ 您提交的PR链接的真实有效性对于后期的开发和奖金的发放至关重要，请您务必予以重视。请您尽快核查链接的有效性，并按照组委会要求提交中期考核材料。若确认链接无误，请忽略本邮件。
+
+
+
+ 如有其他问题，请联系：glcc@ccf.org.cn
+
+
+
+ GLCC组委会
+
+
+ <%=Time.now.strftime('%Y年%m月%d日')%>
+
+
+
+
+
 %>)
+ <% end %>
+
+ 
+