From 304aa486984478ed57a2a359c49486bd10d9e2da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 15 Nov 2019 17:09:50 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/home/shixunsHome.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js index 873461600..6971cf36c 100644 --- a/public/react/src/modules/home/shixunsHome.js +++ b/public/react/src/modules/home/shixunsHome.js @@ -235,7 +235,7 @@ class ShixunsHome extends Component { {/*实训路径*/} - {pathstype===true?"":
+ {pathstype===true||homedatalist===undefined?"":homedatalist.subjects.length===0?"":

实践课程

TRAINING COURSE

@@ -314,7 +314,7 @@ class ShixunsHome extends Component {
} {/*精选实训 改为 开发社区*/} - {shixuntype===true?"":
+ {shixuntype===true||homedatalist===undefined?"":homedatalist.shixuns.length===0?"":

实训项目

DEVELOPMENT COMMUNITY

From e04b68307c67efd11b8e20a1b91539870d23ea56 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 15 Nov 2019 17:20:10 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users/recent_contacts_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users/recent_contacts_controller.rb b/app/controllers/users/recent_contacts_controller.rb index bc4b8ea8f..ea8e005d1 100644 --- a/app/controllers/users/recent_contacts_controller.rb +++ b/app/controllers/users/recent_contacts_controller.rb @@ -3,6 +3,6 @@ class Users::RecentContactsController < Users::BaseController def index contacts = observed_user.recent_contacts.distinct - @contacts = contacts.order('private_messages.created_at DESC').limit(10).includes(:user_extension) + @contacts = contacts.where(laboratory_id: current_laboratory.id).order('private_messages.created_at DESC').limit(10).includes(:user_extension) end end \ No newline at end of file From 56cd10fae052cf1dee8b47ad7a7aaa78d2a64dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 15 Nov 2019 17:22:54 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 6 +++--- public/react/src/modules/tpm/TPMIndex.css | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index fc633c975..355e4a94c 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -1283,7 +1283,7 @@ submittojoinclass=(value)=>{
-
:""} - + :""}
diff --git a/public/react/src/modules/tpm/TPMIndex.css b/public/react/src/modules/tpm/TPMIndex.css index 740ae8a20..10eb9dc11 100644 --- a/public/react/src/modules/tpm/TPMIndex.css +++ b/public/react/src/modules/tpm/TPMIndex.css @@ -218,4 +218,8 @@ body>.-task-title { float: left; min-width: 40px; height:40px; +} + +.headwith100b{ + width: 100%; } \ No newline at end of file From 4d396702d52042cfbdf685df7f33c5a3162668d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 15 Nov 2019 17:36:44 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 355e4a94c..bac8861bd 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -1356,7 +1356,7 @@ submittojoinclass=(value)=>{
:""} - :""} + } From 6e0bd9c1f9b101fb34e79a534b04abe19c47f744 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 15 Nov 2019 17:40:34 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BA=91=E4=B8=8A=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=9A=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 6 ++++-- app/controllers/shixuns_controller.rb | 1 + app/controllers/subjects_controller.rb | 1 + app/controllers/users/recent_contacts_controller.rb | 3 ++- app/controllers/users_for_private_messages_controller.rb | 3 ++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 98c70e0b4..7ebf7435d 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -467,7 +467,8 @@ class CoursesController < ApplicationController # user_ids_of_course_members = @course.course_members.where(role: [1,2,3]).pluck(:user_id) # @users = User.where.not(id: user_ids_of_course_members) - @users = User.where(status: User::STATUS_ACTIVE, laboratory_id: @course.laboratory_id) + @users = User.where(status: User::STATUS_ACTIVE) + @users = @users.where(laboratory_id: current_laboratory.id) unless current_laboratory.main_site? @users = @users.where("concat(users.lastname, users.firstname) like '%#{name}%'") if name.present? # REDO:Extension @users = @users.joins(user_extension: :school).where("schools.name like '%#{school_name}%'") if school_name.present? @@ -1083,7 +1084,8 @@ class CoursesController < ApplicationController school_name = params[:school_name] # REDO:Extension - @users = User.where(status: User::STATUS_ACTIVE, laboratory_id: @course.laboratory_id) + @users = User.where(status: User::STATUS_ACTIVE) + @users = @users.where(laboratory_id: current_laboratory.id) unless current_laboratory.main_site? @users = @users.where("concat(users.lastname, users.firstname) like '%#{name}%'") if name.present? # REDO:Extension @users = @users.joins(user_extension: :school).where("schools.name like '%#{school_name}%'") if school_name.present? diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 619d2c8a7..9077192cf 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -919,6 +919,7 @@ class ShixunsController < ApplicationController else @users = User.none end + @users = @users.where(laboratory_id: current_laboratory.id) unless current_laboratory.main_site? page = params[:page] || 1 limit = params[:limit] || 20 @user_count = @users.count diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb index 25cf93faa..d4f1281a2 100644 --- a/app/controllers/subjects_controller.rb +++ b/app/controllers/subjects_controller.rb @@ -302,6 +302,7 @@ class SubjectsController < ApplicationController member_ids = @subject.subject_members.map(&:user_id).join(',') condition = "%#{params[:search].strip}%".gsub(" ","") @users = User.where("id not in (?) and status = 1 and LOWER(concat(lastname, ifnull(firstname, ''), login)) LIKE ?", member_ids, "#{condition}") + @users = @users.where(laboratory_id: current_laboratory.id) unless current_laboratory.main_site? @users = @users.page(page).per(10) @users = @users.includes(:user_extension) diff --git a/app/controllers/users/recent_contacts_controller.rb b/app/controllers/users/recent_contacts_controller.rb index ea8e005d1..2576385b2 100644 --- a/app/controllers/users/recent_contacts_controller.rb +++ b/app/controllers/users/recent_contacts_controller.rb @@ -3,6 +3,7 @@ class Users::RecentContactsController < Users::BaseController def index contacts = observed_user.recent_contacts.distinct - @contacts = contacts.where(laboratory_id: current_laboratory.id).order('private_messages.created_at DESC').limit(10).includes(:user_extension) + contacts = contacts.where(laboratory_id: current_laboratory.id) unless current_laboratory.main_site? + @contacts = contacts.order('private_messages.created_at DESC').limit(10).includes(:user_extension) end end \ No newline at end of file diff --git a/app/controllers/users_for_private_messages_controller.rb b/app/controllers/users_for_private_messages_controller.rb index 1caf52a6c..610bf5d52 100644 --- a/app/controllers/users_for_private_messages_controller.rb +++ b/app/controllers/users_for_private_messages_controller.rb @@ -2,7 +2,8 @@ class UsersForPrivateMessagesController < ApplicationController before_action :require_login, :check_auth def index - users = User.active.where.not(id: current_user.id).where(laboratory_id: current_laboratory.id) + users = User.active.where.not(id: current_user.id) + users = users.where(laboratory_id: current_laboratory.id) unless current_laboratory.main_site? keyword = params[:keyword].to_s.strip if keyword.blank? From 3894f45c237e49a1c51231af2bd092782b55de17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 15 Nov 2019 17:49:05 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/login/LoginDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js index 04a0312fd..1a5802782 100644 --- a/public/react/src/modules/login/LoginDialog.js +++ b/public/react/src/modules/login/LoginDialog.js @@ -604,7 +604,7 @@ class LoginDialog extends Component { setNotcompleteds={()=>{this.setNotcompleteds()}} /> - {this.state.isphone===false?