Merge remote-tracking branch 'origin/dev_jupyter' into dev_jupyter

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}"

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>

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;