Merge branch 'standalone' of https://git.trustie.net/jasder/forgeplus into standalone

This commit is contained in:
jasder 2021-03-31 12:45:09 +08:00
commit c55c04b137
10 changed files with 17 additions and 25 deletions

View File

@ -6,7 +6,7 @@
# tracker_id :integer not null
# project_id :integer not null
# subject :string(255) default(""), not null
# description :text(4294967295)
# description :text(65535)
# due_date :date
# category_id :integer
# status_id :integer not null
@ -14,6 +14,7 @@
# priority_id :integer not null
# fixed_version_id :integer
# author_id :integer not null
# lock_version :integer default("0"), not null
# created_on :datetime
# updated_on :datetime
# start_date :date
@ -27,7 +28,7 @@
# closed_on :datetime
# project_issues_index :integer
# issue_type :string(255)
# token :integer default("0")
# token :string(255)
# issue_tags_value :string(255)
# is_lock :boolean default("0")
# issue_classify :string(255)

View File

@ -11,6 +11,11 @@
# sync_subject :boolean default("0")
# sync_shixun :boolean default("0")
#
# Indexes
#
# index_laboratories_on_identifier (identifier) UNIQUE
# index_laboratories_on_school_id (school_id)
#
class Laboratory < ApplicationRecord
belongs_to :school, optional: true

View File

@ -6,6 +6,10 @@
# laboratory_id :integer
# config :text(65535)
#
# Indexes
#
# index_laboratory_settings_on_laboratory_id (laboratory_id)
#
class LaboratorySetting < ApplicationRecord
belongs_to :laboratory

View File

@ -7,7 +7,6 @@
# content :text(65535)
# created_at :datetime not null
# updated_at :datetime not null
# is_secret :boolean default("0")
#
class License < ApplicationRecord

View File

@ -11,7 +11,6 @@
# course_group_id :integer default("0")
# is_collect :integer default("1")
# graduation_group_id :integer default("0")
# is_apply_signature :boolean default("0")
#
# Indexes
#

View File

@ -4,7 +4,7 @@
#
# id :integer not null, primary key
# name :string(255) default(""), not null
# description :text(4294967295)
# description :text(65535)
# homepage :string(255) default("")
# is_public :boolean default("1"), not null
# parent_id :integer
@ -43,17 +43,6 @@
# watchers_count :integer default("0")
# issues_count :integer default("0")
# pull_requests_count :integer default("0")
# language :string(255)
# versions_count :integer default("0")
# issue_tags_count :integer default("0")
# closed_issues_count :integer default("0")
# open_devops :boolean default("0")
# gitea_webhook_id :integer
# open_devops_count :integer default("0")
# recommend :boolean default("0")
# platform :integer default("0")
# default_branch :string(255) default("master")
# website :string(255)
#
# Indexes
#

View File

@ -16,11 +16,6 @@
# head :string(255)
# base :string(255)
# issue_id :integer
# fork_project_id :integer
# is_original :boolean default("0")
# comments_count :integer default("0")
# commits_count :integer default("0")
# files_count :integer default("0")
#
class PullRequest < ApplicationRecord

View File

@ -58,7 +58,7 @@ class Site < ApplicationRecord
commons = [
{name: '通知', key: 'notice', url: '/users/current_user/user_messages'},
{name: '找回密码', key: 'lost_password', url: '/account/lost_password'},
{name: '注册', key: 'register', url: '/login?login=false'}
{name: '注册', key: 'register', url: '/register'}
]
commons.each { |ele|

View File

@ -31,7 +31,7 @@
<li><%= sidebar_item(admins_laboratories_path, '云上实验室', icon: 'cloud', controller: 'admins-laboratories') %></li>
<li>
<!-- <li>
<%= sidebar_item_group('#setting-submenu', '网站建设', icon: 'cogs') do %>
<li><%= sidebar_item(edit_admins_about_path, '关于我们', icon: 'smile-o', controller: 'admins-abouts') %></li>
<li><%= sidebar_item(edit_admins_contact_us_path, '联系我们', icon: 'commenting-o', controller: 'admins-contact_us') %></li>
@ -39,7 +39,7 @@
<li><%= sidebar_item(edit_admins_agreement_path, '服务协议', icon: 'file-text-o', controller: 'admins-agreements') %></li>
<li><%= sidebar_item(edit_admins_help_center_path, '帮助中心', icon: 'question-circle-o', controller: 'admins-help_centers') %></li>
<% end %>
</li>
</li> -->
<li>
<%= sidebar_item('/admins/sidekiq', '定时任务', icon: 'bell', controller: 'root') %>
</li>

View File

@ -3422,7 +3422,7 @@ COMMIT;
-- Records of laboratory_settings
-- ----------------------------
BEGIN;
INSERT INTO `laboratory_settings` VALUES (1, 1, '{\"name\":\"EduCoder\",\"navbar\":[{\"name\":\"实践课程\",\"link\":\"/paths\",\"hidden\":false},{\"name\":\"翻转课堂\",\"link\":\"/courses\",\"hidden\":false},{\"name\":\"实现项目\",\"link\":\"/shixuns\",\"hidden\":false},{\"name\":\"在线竞赛\",\"link\":\"/competitions\",\"hidden\":false},{\"name\":\"教学案例\",\"link\":\"/moop_cases\",\"hidden\":false},{\"name\":\"交流问答\",\"link\":\"/forums\",\"hidden\":false}],\"footer\":\"\\n\\u003cp class=\\\"footer_con-p inline lineh-30 font-14\\\"\\u003e\\n \\u003cspan class=\\\"font-18 fl\\\"\\u003e©\\u003c/span\\u003e\\u0026nbsp;2019\\u0026nbsp;EduCoder\\n \\u003ca target=\\\"_blank\\\" href=\\\"http://beian.miit.gov.cn/\\\" class=\\\"ml15 mr15\\\" style=\\\"color: rgb(136, 136, 136);\\\"\\u003e湘ICP备17009477号\\u003c/a\\u003e\\n \\u003ca target=\\\"_blank\\\" href=\\\"http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=43019002000962\\\" class=\\\"mr15\\\" style=\\\"color: rgb(136, 136, 136);\\\"\\u003e\\n \\u003cimg class=\\\"vertical4\\\" src=\\\"https://ali-cdn.educoder.net/react/build/static/media/beian.d0289dc0.png\\\"\\u003e湘公网安备43019002000962号\\n \\u003c/a\\u003e\\n \\u003ca href=\\\"https://team.trustie.net\\\" target=\\\"_blank\\\" style=\\\"color: rgb(136, 136, 136);\\\"\\u003eTrustie\\u003c/a\\u003e\\n \\u0026nbsp;\\u0026nbsp;\\u0026nbsp;\\u0026amp;\\u0026nbsp;\\u0026nbsp;\\u0026nbsp;IntelliDE inside.\\n \\u003cspan class=\\\"mr15\\\"\\u003e版权所有 湖南智擎科技有限公司\\u003c/span\\u003e\\u003c/p\\u003e\\n \"}');
INSERT INTO `laboratory_settings` VALUES (1, 1, '{\"name\":\"Trustie\",\"navbar\":[{\"name\":\"开源项目\",\"link\":\"/projects\",\"hidden\":false}],\"footer\":\"\\u003cdiv class=\\\"inner-footer_con\\\"\\u003e\\r\\n \\u003cul class=\\\"clearfix inner-footernav\\\" style=\\\"\\r\\n padding-left: 70px;\\\"\\u003e\\r\\n \\u003cli\\u003e\\u003ca href=\\\"/\\\" class=\\\"fl\\\"\\u003e网站首页\\u003c/a\\u003e\\u003c/li\\u003e\\r\\n \\u003cli\\u003e\\u003ca href=\\\"https://www.trustie.net/agreements\\\" class=\\\"fl\\\" target=\\\"_blank\\\"\\u003e服务协议\\u003c/a\\u003e\\u003c/li\\u003e\\r\\n \\u003cli\\u003e\\u003ca href=\\\"https://forum.trustie.net/forums/1168/detail\\\" class=\\\"fl\\\" target=\\\"_blank\\\"\\u003e帮助中心\\u003c/a\\u003e\\u003c/li\\u003e\\r\\n \\u003cli\\u003e\\u003ca href=\\\"https://forum.trustie.net\\\" class=\\\"fl\\\" target=\\\"_blank\\\"\\u003e问吧交流\\u003c/a\\u003e\\u003c/li\\u003e\\r\\n \\u003cli\\u003e\\u003ca href=\\\"https://www.trustie.net/cooperation\\\" class=\\\"fl\\\" target=\\\"_blank\\\"\\u003e合作伙伴\\u003c/a\\u003e\\u003c/li\\u003e\\r\\n \\u003c/ul\\u003e\\r\\n\\u003c/div\\u003e\\r\\n\\u003cdiv\\u003e\\r\\n\\u003cp class=\\\"footer_con-p inline lineh-30 font-14\\\"\\u003e\\r\\n \\u003cspan class=\\\"font-18 fl\\\"\\u003e©\\u003c/span\\u003e\\u0026nbsp;Copyright 2007~2021, \\u0026nbsp;国防科技大学Trustie团队 \\u0026 IntelliDE.\\u0026nbsp;\\u0026nbsp;\\r\\n \\u003ca target=\\\"_blank\\\" href=\\\"http://beian.miit.gov.cn/\\\" class=\\\"mr15\\\" style=\\\"color: rgb(136, 136, 136);\\\"\\u003e湘ICP备17009477号\\u003c/a\\u003e\\r\\n\\u003c/div\\u003e\\r\\n\\u003cdiv class=\\\"cl\\\"\\u003e\\u003c/div\\u003e\"}');
COMMIT;
-- ----------------------------