diff --git a/app/controllers/admins/dashboards_controller.rb b/app/controllers/admins/dashboards_controller.rb
index c01946a9e..47f7d56a2 100644
--- a/app/controllers/admins/dashboards_controller.rb
+++ b/app/controllers/admins/dashboards_controller.rb
@@ -1,4 +1,6 @@
class Admins::DashboardsController < Admins::BaseController
+ before_action :require_business
+
def index
# 用户活跃数
day_user_ids = CommitLog.where(created_at: today).pluck(:user_id).uniq
diff --git a/app/controllers/admins/projects_controller.rb b/app/controllers/admins/projects_controller.rb
index 79582cb7c..99ed18b44 100644
--- a/app/controllers/admins/projects_controller.rb
+++ b/app/controllers/admins/projects_controller.rb
@@ -1,5 +1,5 @@
class Admins::ProjectsController < Admins::BaseController
- before_action :require_admin
+ before_action :require_business
before_action :find_project, only: [:edit, :update]
def index
diff --git a/app/controllers/admins/users_controller.rb b/app/controllers/admins/users_controller.rb
index f552c9cd1..befca73f9 100644
--- a/app/controllers/admins/users_controller.rb
+++ b/app/controllers/admins/users_controller.rb
@@ -1,5 +1,5 @@
class Admins::UsersController < Admins::BaseController
- before_action :require_admin
+ before_action :require_business
before_action :finder_user, except: [:index]
def index
diff --git a/app/views/admins/organizations/shared/_org_list.html.erb b/app/views/admins/organizations/shared/_org_list.html.erb
index 148681fb2..04c92be0e 100644
--- a/app/views/admins/organizations/shared/_org_list.html.erb
+++ b/app/views/admins/organizations/shared/_org_list.html.erb
@@ -27,6 +27,7 @@
| <%= link_to org.organization_users_count, "/#{org.login}", target: "_blank" %> |
<%= link_to org.projects_count, "/#{org.login}", target: "_blank" %> |
+ <% if current_user.admin? %>
<%= 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' %>
@@ -36,6 +37,7 @@
<%= delete_link '删除', admins_organization_path(org, element: ".user-item-#{org.id}"), class: 'dropdown-item delete-user-action' %>
+ <% end %>
|
<% end %>
diff --git a/app/views/admins/project_categories/_list.html.erb b/app/views/admins/project_categories/_list.html.erb
index c4b70f52d..424ddbb6d 100644
--- a/app/views/admins/project_categories/_list.html.erb
+++ b/app/views/admins/project_categories/_list.html.erb
@@ -25,8 +25,10 @@
<%= project_category.projects.select(:id).where(is_pinned: true).size %> |
<%= project_category.created_at&.strftime('%Y-%m-%d %H:%M') %> |
+ <% if current_user.admin? %>
<%= link_to "编辑", edit_admins_project_category_path(project_category), remote: true, class: "action" %>
<%= link_to "删除", admins_project_category_path(project_category), method: :delete, data:{confirm: "确认删除的吗？"}, class: "action" %>
+ <% end %>
|
<% end %>
diff --git a/app/views/admins/project_ignores/_list.html.erb b/app/views/admins/project_ignores/_list.html.erb
index 066ef8540..74ea5aea1 100644
--- a/app/views/admins/project_ignores/_list.html.erb
+++ b/app/views/admins/project_ignores/_list.html.erb
@@ -31,8 +31,10 @@
=end%>
<%= project_ignore.created_at&.strftime('%Y-%m-%d %H:%M') %> |
+ <% if current_user.admin? %>
<%= link_to "编辑", edit_admins_project_ignore_path(project_ignore),remote: true, class: "action" %>
<%= link_to "删除", admins_project_ignore_path(project_ignore), method: :delete, data:{confirm: "确认删除的吗？"}, class: "action" %>
+ <% end %>
|
<% end %>
diff --git a/app/views/admins/project_languages/_list.html.erb b/app/views/admins/project_languages/_list.html.erb
index 9afaca07c..52535e875 100644
--- a/app/views/admins/project_languages/_list.html.erb
+++ b/app/views/admins/project_languages/_list.html.erb
@@ -19,8 +19,10 @@
<%= project_language.projects_count %> |
<%= project_language.created_at&.strftime('%Y-%m-%d %H:%M') %> |
+ <% if current_user.admin? %>
<%= link_to "编辑", edit_admins_project_language_path(project_language), remote: true, class: "action" %>
<%= link_to "删除", admins_project_language_path(project_language), method: :delete, data:{confirm: "确认删除的吗？"}, class: "action" %>
+ <% end %>
|
<% end %>
diff --git a/app/views/admins/project_licenses/_list.html.erb b/app/views/admins/project_licenses/_list.html.erb
index 88f253ae1..51bc28476 100644
--- a/app/views/admins/project_licenses/_list.html.erb
+++ b/app/views/admins/project_licenses/_list.html.erb
@@ -33,8 +33,10 @@
=end%>
<%= project_license.created_at&.strftime('%Y-%m-%d %H:%M') %> |
+ <% if current_user.admin? %>
<%= link_to "编辑", edit_admins_project_license_path(project_license),remote: true, class: "action" %>
<%= link_to "删除", admins_project_license_path(project_license), method: :delete, data:{confirm: "确认删除的吗？"}, class: "action" %>
+ <% end %>
|
<% end %>
diff --git a/app/views/admins/projects/shared/_list.html.erb b/app/views/admins/projects/shared/_list.html.erb
index eb0e61255..7b0833e72 100644
--- a/app/views/admins/projects/shared/_list.html.erb
+++ b/app/views/admins/projects/shared/_list.html.erb
@@ -37,12 +37,14 @@
<%= project.created_on&.strftime('%Y-%m-%d %H:%M') %> |
+ <% if current_user.admin? %>
<% if project.is_public %>
<%= javascript_void_link '推荐', class: 'action recommend-action', data: { id: project.id }, style: project.recommend ? 'display: none;' : '' %>
<%= javascript_void_link '取消推荐', class: 'action unrecommend-action', data: { id: project.id }, style: project.recommend ? '' : 'display: none;' %>
<%= link_to "设置推荐等级", edit_admins_project_path(project.id), remote: true, class: "action edit-recommend-action", style: project.recommend ? '' : 'display: none;' %>
<% end %>
<%= link_to "删除", admins_project_path(project.id), method: :delete, data:{confirm: "确认删除的吗？"}, class: "delete-project-action" %>
+ <% end %>
|
<% end %>
diff --git a/app/views/admins/shared/_sidebar_xwsfk.html.erb b/app/views/admins/shared/_sidebar_xwsfk.html.erb
new file mode 100644
index 000000000..25fab3634
--- /dev/null
+++ b/app/views/admins/shared/_sidebar_xwsfk.html.erb
@@ -0,0 +1,63 @@
+<% sidebar_collapse = request.cookies['admin_sidebar_collapse'].to_s == 'true' %>
+
diff --git a/app/views/admins/users/shared/_user_list.html.erb b/app/views/admins/users/shared/_user_list.html.erb
index 4ef85bc5a..725a7e798 100644
--- a/app/views/admins/users/shared/_user_list.html.erb
+++ b/app/views/admins/users/shared/_user_list.html.erb
@@ -27,26 +27,28 @@
<%= display_text(user.last_login_on&.strftime('%Y-%m-%d %H:%M')) %> |
<%= link_to user.projects_count, "/#{user.login}/projects", target: "_blank" %> |
- <%= link_to '编辑', edit_admins_user_path(user), class: 'action' %>
+ <% if current_user.admin? %>
+ <%= link_to '编辑', edit_admins_user_path(user), class: 'action' %>
- <%= javascript_void_link '解锁', class: 'action unlock-action', data: { id: user.id }, style: user.locked? ? '' : 'display: none;' %>
+ <%= javascript_void_link '解锁', class: 'action unlock-action', data: { id: user.id }, style: user.locked? ? '' : 'display: none;' %>
- <% if user.registered? %>
- <%= javascript_void_link '激活', class: 'action active-action', data: { id: user.id } %>
- <% end %>
+ <% if user.registered? %>
+ <%= javascript_void_link '激活', class: 'action active-action', data: { id: user.id } %>
+ <% end %>
- <% if user.id != current_user.id %>
- <%= javascript_void_link '加锁', class: 'action lock-action', data: { id: user.id }, style: user.locked? || user.registered? ? 'display: none;' : '' %>
- <% end %>
+ <% if user.id != current_user.id %>
+ <%= javascript_void_link '加锁', class: 'action lock-action', data: { id: user.id }, style: user.locked? || user.registered? ? 'display: none;' : '' %>
+ <% end %>
-
- <%= javascript_void_link('更多', class: 'action dropdown-toggle', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) %>
-
+ <% end %>
|
<% end %>