Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/views/admins/myshixuns/shared/_list.html.erb

@@ -21,9 +21,17 @@
         <td><%= myshixun.id %></td>
         <td><%= myshixun.identifier %></td>
         <td class="text-left">
-          <% current_task = myshixun.last_executable_task || myshixun.last_task %>
+          <% if myshixun.shixun.is_jupyter? %>
-          <%= link_to "/tasks/#{current_task.identifier}", target: '_blank' do %>
+            <%= link_to "/tasks/#{myshixun.identifier}/jupyter", target: '_blank' do %>
-            <%= overflow_hidden_span myshixun.shixun.name, width: 280 %>
+              <%= overflow_hidden_span myshixun.shixun.name, width: 280 %>
+            <% end %>
+          <% else %>
+            <% current_task = myshixun.last_executable_task || myshixun.last_task %>
+            <% if current_task %>
+              <%= link_to "/tasks/#{current_task.identifier}", target: '_blank' do %>
+                <%= overflow_hidden_span myshixun.shixun.name, width: 280 %>
+              <% end %>
+            <% end %>
           <% end %>
         </td>
         <td><%= myshixun.shixun.user.real_name %></td>