From 8c2a543e612c9137b0272c8b830856cfbf6e2853 Mon Sep 17 00:00:00 2001 From: "vilet.yy" Date: Mon, 22 Mar 2021 11:16:35 +0800 Subject: [PATCH 1/6] fix: project code change to default --- app/controllers/repositories_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index b66a5373..cd07803d 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -18,7 +18,6 @@ class RepositoriesController < ApplicationController # 新版项目详情 def detail - return render_not_found unless @project.has_menu_permission("code") @user = current_user @result = Repositories::DetailService.call(@owner, @repository, @user) @project_fork_id = @project.try(:forked_from_project_id) From 8bbfea20791b6a1ffe3a4b47a4e542cd11120389 Mon Sep 17 00:00:00 2001 From: "vilet.yy" Date: Mon, 22 Mar 2021 11:18:04 +0800 Subject: [PATCH 2/6] fix --- app/controllers/projects_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 573dbba8..1fd858be 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -11,7 +11,7 @@ class ProjectsController < ApplicationController menu = [] menu.append(menu_hash_by_name("home")) - menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("code") + menu.append(menu_hash_by_name("code")) menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues") menu.append(menu_hash_by_name("pulls")) if @project.has_menu_permission("pulls") menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops") @@ -26,7 +26,7 @@ class ProjectsController < ApplicationController scope = Projects::ListQuery.call(params) # @projects = kaminari_paginate(scope) - @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner) + @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units) category_id = params[:category_id] @total_count = From 01cad866b8961a37b99a6a50ba5392cd4d606147 Mon Sep 17 00:00:00 2001 From: "vilet.yy" Date: Mon, 22 Mar 2021 14:13:03 +0800 Subject: [PATCH 3/6] fix: laboratory 500 fix fix --- app/views/admins/laboratories/shared/_laboratory_item.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admins/laboratories/shared/_laboratory_item.html.erb b/app/views/admins/laboratories/shared/_laboratory_item.html.erb index 8fdf9c72..828ca443 100644 --- a/app/views/admins/laboratories/shared/_laboratory_item.html.erb +++ b/app/views/admins/laboratories/shared/_laboratory_item.html.erb @@ -10,7 +10,7 @@ <% if school && school.identifier.present? %> - <%= link_to school.identifier.to_s, statistics_college_path(school.identifier), target: '_blank' %> + <%#= link_to school.identifier.to_s, statistics_college_path(school.identifier), target: '_blank' %> <% else %> -- <% end %> From adb315521e596fcac39ef58eee918fd928315fac Mon Sep 17 00:00:00 2001 From: "vilet.yy" Date: Mon, 22 Mar 2021 14:20:03 +0800 Subject: [PATCH 4/6] fix --- .../admins/laboratories/shared/_laboratory_item.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/admins/laboratories/shared/_laboratory_item.html.erb b/app/views/admins/laboratories/shared/_laboratory_item.html.erb index 828ca443..b9fa9c30 100644 --- a/app/views/admins/laboratories/shared/_laboratory_item.html.erb +++ b/app/views/admins/laboratories/shared/_laboratory_item.html.erb @@ -9,11 +9,11 @@ <% end %> - <% if school && school.identifier.present? %> + <%# if school && school.identifier.present? %> <%#= link_to school.identifier.to_s, statistics_college_path(school.identifier), target: '_blank' %> - <% else %> + <%# else %> -- - <% end %> + <%# end %>
From 5c864acb64d038eec1c6312927a458cbee41b23b Mon Sep 17 00:00:00 2001 From: "vilet.yy" Date: Mon, 22 Mar 2021 15:50:08 +0800 Subject: [PATCH 5/6] fix: create repo not use website --- app/services/projects/create_service.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index c6e5b213..f014b8d7 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -46,7 +46,6 @@ class Projects::CreateService < ApplicationService { hidden: !repo_is_public, user_id: params[:user_id], - website: params[:website], identifier: params[:repository_name] } end From 74f6a54d299d337e10f2bc5c212612120ca571b5 Mon Sep 17 00:00:00 2001 From: jasder Date: Mon, 22 Mar 2021 17:58:15 +0800 Subject: [PATCH 6/6] FIX update setting api for nav bar url --- app/controllers/settings_controller.rb | 7 ++++++- app/models/site.rb | 23 +++++++++++++++++++++++ app/views/settings/show.json.jbuilder | 7 +++++++ config/routes.rb | 3 +-- db/migrate/20210322084619_create_sites.rb | 12 ++++++++++++ 5 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 app/models/site.rb create mode 100644 db/migrate/20210322084619_create_sites.rb diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index bb031c7b..7e5e94d5 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -1,6 +1,11 @@ class SettingsController < ApplicationController def show - @old_projects_url = nil + @old_projects_url = nil @old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects" if User.current.logged? + + @add = Site.add + @personal = User.current.logged? ? Site.personal : [] + + # @sites = Site.group(:site_type).select(:name, :url, :key) end end diff --git a/app/models/site.rb b/app/models/site.rb new file mode 100644 index 00000000..0ed8d802 --- /dev/null +++ b/app/models/site.rb @@ -0,0 +1,23 @@ +# == Schema Information +# +# Table name: sites +# +# id :integer not null, primary key +# name :string(255) +# url :string(255) +# key :string(255) +# site_type :integer +# created_at :datetime not null +# updated_at :datetime not null +# + +class Site < ApplicationRecord + # add: 添加类链接 + # personal: 个人名下类链接, + # common: 普通链接 + enum site_type: { add: 0, personal: 1, common: 2 } + + def self.set_default + + end +end diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder index 7de12345..4202283b 100644 --- a/app/views/settings/show.json.jbuilder +++ b/app/views/settings/show.json.jbuilder @@ -47,5 +47,12 @@ json.setting do json.new_course default_course_links json.old_projects_url @old_projects_url + json.add do + json.array! @add, :name, :url, :key + end + + json.personal do + json.array! @personal, :name, :url, :key + end end diff --git a/config/routes.rb b/config/routes.rb index f505003c..24cd6b63 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -23,7 +23,6 @@ Rails.application.routes.draw do resources :edu_settings - resources :edu_settings scope '/api' do namespace :ci do resources :languages, only: [:index, :show] do @@ -382,7 +381,7 @@ Rails.application.routes.draw do end end - resource :repositories, path: '/', only: [:show, :create, :edit] do + resource :repositories, path: '/', only: [:show, :create, :edit] do member do get :files get :detail diff --git a/db/migrate/20210322084619_create_sites.rb b/db/migrate/20210322084619_create_sites.rb new file mode 100644 index 00000000..e05784ec --- /dev/null +++ b/db/migrate/20210322084619_create_sites.rb @@ -0,0 +1,12 @@ +class CreateSites < ActiveRecord::Migration[5.2] + def change + create_table :sites do |t| + t.string :name, comment: "中文名称" + t.string :url, comment: "具体链接" + t.string :key, comment: "标识" + t.integer :site_type, comment: "分类，按照分类编排链接" + + t.timestamps + end + end +end