From 444ec7412e901bfc20c62aba72afe5b19b596c5d Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 17 Dec 2019 09:42:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=A6=E5=91=98=E5=AE=9E=E8=AE=AD?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/admins/myshixuns/shared/_list.html.erb | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/app/views/admins/myshixuns/shared/_list.html.erb b/app/views/admins/myshixuns/shared/_list.html.erb
index a80a4ef23..69efb422e 100644
--- a/app/views/admins/myshixuns/shared/_list.html.erb
+++ b/app/views/admins/myshixuns/shared/_list.html.erb
@@ -21,9 +21,15 @@
<%= myshixun.id %> |
<%= myshixun.identifier %> |
- <% current_task = myshixun.last_executable_task || myshixun.last_task %>
- <%= link_to "/tasks/#{current_task.identifier}", target: '_blank' do %>
- <%= overflow_hidden_span myshixun.shixun.name, width: 280 %>
+ <% if myshixun.shixun.is_jupyter? %>
+ <%= link_to "/tasks/#{myshixun.identifier}/jupyter", target: '_blank' do %>
+ <%= overflow_hidden_span myshixun.shixun.name, width: 280 %>
+ <% end %>
+ <% else %>
+ <% current_task = myshixun.last_executable_task || myshixun.last_task %>
+ <%= link_to "/tasks/#{current_task.identifier}", target: '_blank' do %>
+ <%= overflow_hidden_span myshixun.shixun.name, width: 280 %>
+ <% end %>
<% end %>
|
<%= myshixun.shixun.user.real_name %> |
From d5d21a7e7a790640869a7b351440a56bb06ee512 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 17 Dec 2019 10:04:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AD=A6=E5=91=98=E5=AE=9E=E8=AE=AD?=
=?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/admins/myshixuns/shared/_list.html.erb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/views/admins/myshixuns/shared/_list.html.erb b/app/views/admins/myshixuns/shared/_list.html.erb
index 69efb422e..af43c3c22 100644
--- a/app/views/admins/myshixuns/shared/_list.html.erb
+++ b/app/views/admins/myshixuns/shared/_list.html.erb
@@ -27,8 +27,10 @@
<% end %>
<% else %>
<% current_task = myshixun.last_executable_task || myshixun.last_task %>
- <%= link_to "/tasks/#{current_task.identifier}", target: '_blank' do %>
- <%= overflow_hidden_span myshixun.shixun.name, width: 280 %>
+ <% if current_task %>
+ <%= link_to "/tasks/#{current_task.identifier}", target: '_blank' do %>
+ <%= overflow_hidden_span myshixun.shixun.name, width: 280 %>
+ <% end %>
<% end %>
<% end %>