From 7d5dcc85fba4072225de230ddd1d70df5c7176e9 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 13 Dec 2019 20:22:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8C=82=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/jupyter_service.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/services/jupyter_service.rb b/app/services/jupyter_service.rb
index 417aa4aad..d35d9a041 100644
--- a/app/services/jupyter_service.rb
+++ b/app/services/jupyter_service.rb
@@ -7,7 +7,9 @@ module JupyterService
             shixun_tomcat = edu_setting('cloud_bridge')
             uri = "#{shixun_tomcat}/bridge/jupyter/get"
             tpiID = "tpm#{shixun.id}"
-            params = {tpiID: tpiID, identifier: shixun.identifier, :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"}
+            mount = shixun.data_sets.present?
+            params = {tpiID: tpiID, identifier: shixun.identifier, needMount: mount,
+                      :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"}
     
             logger.info "test_juypter: uri->#{uri}, params->#{params}"
             res = uri_post uri, params
@@ -45,7 +47,9 @@ module JupyterService
             uri = "#{shixun_tomcat}/bridge/jupyter/get"
 
             tpiID = myshixun.id
-            params = {tpiID: tpiID, identifier: shixun.identifier,  :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"}
+            mount = myshixun.shixun.data_sets.present?
+            params = {tpiID: tpiID, identifier: shixun.identifier, needMount: mount,
+                      :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"}
             res = uri_post uri, params
 
             logger.info "test_juypter: #{res}"

From 71651c71e9919a12b42976a5c06209c596573098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 13 Dec 2019 20:30:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/coursesPublic/NewShixunModel.js   | 2 +-
 .../react/src/modules/courses/coursesPublic/Newshixunmodel.css  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
index 52cf945a0..5ee763951 100644
--- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
+++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
@@ -591,7 +591,7 @@ class NewShixunModel extends Component{
 													this.props.type==='shixuns'?
 														(
 															item.is_jupyter===true?
-																<div className="myysljupyter fl ml20 mt3 intermediatecenter">
+																<div className="myysljupyter fl ml20  intermediatecenter">
 																	<p className="myysljupytertest">
 																		Jupyter
 																	</p>
diff --git a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css
index b69c41e25..9bdf44e68 100644
--- a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css
+++ b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css
@@ -391,7 +391,6 @@
     text-align: center;
     border-radius:5px;
     border:1px solid #FF6802;
-    margin-top: 4px;
 }
 .myysljupytertest{
     width:54px;