Gitlink
/
forgeplus
37
1
Fork 58
Code Issues 1 Pull Requests 1 Packages Releases 15 Wiki Activity

fix

This commit is contained in:
vilet.yy 2021-06-04 18:41:19 +08:00
parent 12c252ea10
commit c211c38d87
2 changed files with 25 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
app/models/project.rb
View File

@ -1,11 +1,10 @@
<<<<<<< HEAD
# == Schema Information # == Schema Information
# #
# Table name: projects # Table name: projects
# #
# id :integer not null, primary key # id :integer not null, primary key
# name :string(255) default(""), not null # name :string(255) default(""), not null
# description :text(4294967295) # description :text(65535)
# homepage :string(255) default("") # homepage :string(255) default("")
# is_public :boolean default("1"), not null # is_public :boolean default("1"), not null
# parent_id :integer # parent_id :integer
@ -38,24 +37,12 @@
# rep_identifier :string(255) # rep_identifier :string(255)
# project_category_id :integer # project_category_id :integer
# project_language_id :integer # project_language_id :integer
# license_id :integer
# ignore_id :integer
# praises_count :integer default("0") # praises_count :integer default("0")
# watchers_count :integer default("0") # watchers_count :integer default("0")
# issues_count :integer default("0") # issues_count :integer default("0")
# pull_requests_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")
# license_id :integer
# ignore_id :integer
# default_branch :string(255) default("master")
# website :string(255)
# lesson_url :string(255)
# #
# Indexes # Indexes
# #
@ -72,69 +59,6 @@
# index_projects_on_updated_on (updated_on) # index_projects_on_updated_on (updated_on)
# #
=======
# == Schema Information
#
# Table name: projects
#
# id :integer not null, primary key
# name :string(255) default(""), not null
# description :text(65535)
# homepage :string(255) default("")
# is_public :boolean default("1"), not null
# parent_id :integer
# created_on :datetime
# updated_on :datetime
# identifier :string(255)
# status :integer default("1"), not null
# lft :integer
# rgt :integer
# inherit_members :boolean default("0"), not null
# project_type :integer default("0")
# hidden_repo :boolean default("0"), not null
# attachmenttype :integer default("1")
# user_id :integer
# dts_test :integer default("0")
# enterprise_name :string(255)
# organization_id :integer
# project_new_type :integer
# gpid :integer
# forked_from_project_id :integer
# forked_count :integer default("0")
# publish_resource :integer default("0")
# visits :integer default("0")
# hot :integer default("0")
# invite_code :string(255)
# qrcode :string(255)
# qrcode_expiretime :integer default("0")
# script :text(65535)
# training_status :integer default("0")
# rep_identifier :string(255)
# project_category_id :integer
# project_language_id :integer
# license_id :integer
# ignore_id :integer
# praises_count :integer default("0")
# watchers_count :integer default("0")
# issues_count :integer default("0")
# pull_requests_count :integer default("0")
#
# Indexes
#
# index_projects_on_forked_from_project_id (forked_from_project_id)
# index_projects_on_identifier (identifier)
# index_projects_on_is_public (is_public)
# index_projects_on_lft (lft)
# index_projects_on_name (name)
# index_projects_on_platform (platform)
# index_projects_on_project_type (project_type)
# index_projects_on_recommend (recommend)
# index_projects_on_rgt (rgt)
# index_projects_on_status (status)
# index_projects_on_updated_on (updated_on)
#
>>>>>>> ed8d646d479bdcd84784909a024949bb8e4f093f
class Project < ApplicationRecord class Project < ApplicationRecord

47
app/models/user_extension.rb
View File

@ -22,15 +22,12 @@
# school_id :integer # school_id :integer
# description :string(255) default("") # description :string(255) default("")
# department_id :integer # department_id :integer
<<<<<<< HEAD
# province :string(255) # province :string(255)
# city :string(255) # city :string(255)
# custom_department :string(255) # custom_department :string(255)
# show_email :boolean default("0") # show_email :boolean default("0")
# show_location :boolean default("0") # show_location :boolean default("0")
# show_department :boolean default("0") # show_department :boolean default("0")
=======
>>>>>>> ed8d646d479bdcd84784909a024949bb8e4f093f
# #
# Indexes # Indexes
# #
@ -39,25 +36,25 @@
# index_user_extensions_on_user_id (user_id) # index_user_extensions_on_user_id (user_id)
# #
class UserExtension < ApplicationRecord class UserExtension < ApplicationRecord
# identity 0: 教师教授 1: 学生, 2: 专业人士, 3: 开发者 # identity 0: 教师教授 1: 学生, 2: 专业人士, 3: 开发者
enum identity: { teacher: 0, student: 1, professional: 2, developer: 3, enterprise: 4, unselect: -1 } enum identity: { teacher: 0, student: 1, professional: 2, developer: 3, enterprise: 4, unselect: -1 }
belongs_to :user, touch: true belongs_to :user, touch: true
belongs_to :school, optional: true belongs_to :school, optional: true
# belongs_to :department, optional: true # belongs_to :department, optional: true
# before_save :set_laboratory_school # before_save :set_laboratory_school
def identity_text def identity_text
I18n.t("user.identity.#{identity}") I18n.t("user.identity.#{identity}")
end end
private private
def set_laboratory_school def set_laboratory_school
# return unless new_record? # return unless new_record?
# self.school_id = Laboratory.current.school_id if school_id.blank? && !Laboratory.current.main_site? # self.school_id = Laboratory.current.school_id if school_id.blank? && !Laboratory.current.main_site?
end end
end end