From f57af4bcd8a56169950bc77bb69f4e6c31b07203 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 16 Apr 2020 09:42:08 +0800 Subject: [PATCH] =?UTF-8?q?setting=E7=9A=84api=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/settings_controller.rb | 1 + app/models/laboratory_setting.rb | 13 ++++--- app/models/user.rb | 4 +-- app/views/settings/show.json.jbuilder | 47 ++++++++++++++++++-------- 4 files changed, 41 insertions(+), 24 deletions(-) diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 896e2a52..0d4906c2 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -1,4 +1,5 @@ class SettingsController < ApplicationController def show + end end diff --git a/app/models/laboratory_setting.rb b/app/models/laboratory_setting.rb index e53b54cd..fbf44e4c 100644 --- a/app/models/laboratory_setting.rb +++ b/app/models/laboratory_setting.rb @@ -61,13 +61,12 @@ class LaboratorySetting < ApplicationRecord { name: nil, 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 }, - { 'name' => '开发者社区', 'link' => '/problems', 'hidden' => false }, + { 'name' => '首页', 'link' => '/projects', 'hidden' => false }, + { 'name' => '课程', 'link' => '/courses', 'hidden' => false }, + { 'name' => '项目', 'link' => '/projects', 'hidden' => false }, + { 'name' => '数据', 'link' => '/datas', 'hidden' => false }, + { 'name' => '竞赛', 'link' => '/competitions', 'hidden' => false }, + { 'name' => '问吧', 'link' => '/forums', 'hidden' => false }, ], footer: nil } diff --git a/app/models/user.rb b/app/models/user.rb index 3a2083d2..99e9acff 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -591,8 +591,8 @@ class User < ApplicationRecord def self.anonymous anonymous_user = AnonymousUser.unscoped.take if anonymous_user.nil? - anonymous_user = AnonymousUser.unscoped.create(lastname: 'Anonymous', firstname: '', login: '', - mail: '358551897@qq.com', phone: '13333333333', status: 0, platform: User.platform[:forge]) + # anonymous_user = AnonymousUser.unscoped.create(lastname: 'Anonymous', firstname: '', login: '', mail: '358551897@qq.com', phone: '13333333333', status: 0, platform: User.platform[:forge]) + anonymous_user = User.find(2) raise "Unable to create the anonymous user： error_info:#{anonymous_user.errors.messages}" if anonymous_user.new_record? end anonymous_user diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder index e53aa0d1..706dac15 100644 --- a/app/views/settings/show.json.jbuilder +++ b/app/views/settings/show.json.jbuilder @@ -1,23 +1,40 @@ json.setting do - if @laboratory.present? - setting = @laboratory.laboratory_setting - json.name setting.name || default_setting.name - json.nav_logo_url (setting.nav_logo_url || default_setting.nav_logo_url)&.[](1..-1) - json.login_logo_url (setting.login_logo_url || default_setting.login_logo_url)&.[](1..-1) - json.tab_logo_url (setting.tab_logo_url || default_setting.tab_logo_url)&.[](1..-1) + # if @laboratory.present? + # setting = @laboratory.laboratory_setting + # json.name setting.name || default_setting.name + # json.nav_logo_url (setting.nav_logo_url || default_setting.nav_logo_url)&.[](1..-1) + # json.login_logo_url (setting.login_logo_url || default_setting.login_logo_url)&.[](1..-1) + # json.tab_logo_url (setting.tab_logo_url || default_setting.tab_logo_url)&.[](1..-1) + # + # json.subject_banner_url (setting.subject_banner_url || default_setting.subject_banner_url)&.[](1..-1) + # json.course_banner_url (setting.course_banner_url || default_setting.course_banner_url)&.[](1..-1) + # json.competition_banner_url (setting.competition_banner_url || default_setting.competition_banner_url)&.[](1..-1) + # json.moop_cases_banner_url (setting.moop_cases_banner_url || default_setting.moop_cases_banner_url)&.[](1..-1) + # json.oj_banner_url (setting.oj_banner_url || default_setting.oj_banner_url)&.[](1..-1) + # + # json.navbar setting.navbar || default_setting.navbar + # + # json.footer setting.footer || default_setting.footer + # + # json.main_site current_laboratory.main_site? + # end - json.subject_banner_url (setting.subject_banner_url || default_setting.subject_banner_url)&.[](1..-1) - json.course_banner_url (setting.course_banner_url || default_setting.course_banner_url)&.[](1..-1) - json.competition_banner_url (setting.competition_banner_url || default_setting.competition_banner_url)&.[](1..-1) - json.moop_cases_banner_url (setting.moop_cases_banner_url || default_setting.moop_cases_banner_url)&.[](1..-1) - json.oj_banner_url (setting.oj_banner_url || default_setting.oj_banner_url)&.[](1..-1) + json.name default_setting.name + 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.navbar setting.navbar || default_setting.navbar + json.subject_banner_url default_setting.subject_banner_url&.[](1..-1) + json.course_banner_url default_setting.course_banner_url&.[](1..-1) + json.competition_banner_url default_setting.competition_banner_url&.[](1..-1) + json.moop_cases_banner_url default_setting.moop_cases_banner_url&.[](1..-1) + json.oj_banner_url default_setting.oj_banner_url&.[](1..-1) - json.footer setting.footer || default_setting.footer + json.navbar default_setting.navbar - json.main_site current_laboratory.main_site? - end + json.footer default_setting.footer + + json.main_site current_laboratory.main_site? end \ No newline at end of file