123
/
seminar
forked from spen/seminar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some error

This commit is contained in:
chiu 2019-11-13 11:36:06 +08:00
parent 51a6af8443
commit fc737ec6a8
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/views/admin/seminars/seminar_signup.html.erb
View File

@ -19,6 +19,7 @@
<tr class="sort-header"> <tr class="sort-header">
<th class='span2'><%= t('seminar_signup.name')%></th> <th class='span2'><%= t('seminar_signup.name')%></th>
<th class='span2'><%= t('seminar.registration_status')%></th> <th class='span2'><%= t('seminar.registration_status')%></th>
<th class='span2'><%= t('seminar_signup.file_note')%></th>
<th class='span2'><%= t('seminar_signup.uploads')%></th> <th class='span2'><%= t('seminar_signup.uploads')%></th>
</tr> </tr>
</thead> </thead>
@ -36,14 +37,18 @@
</ul> </ul>
</div> </div>
</td> </td>
<td><%= t("seminar.registration_status_#{seminar_signup.status}") if !seminar_signup.status.blank? %></td> <td><%= t("seminar.registration_status_#{seminar_signup.status}") if !seminar_signup.status.blank? %>
</td>
<td>
<li><%= seminar_signup_contribute.description.to_s.html_safe %></li>
</ul>
</td>
<td> <td>
<ul> <ul>
<% seminar_signup.seminar_signup_contributes.collect do |seminar_signup_contribute| %> <% seminar_signup.seminar_signup_contributes.collect do |seminar_signup_contribute| %>
<li><%= link_to (seminar_signup_contribute.title.blank? ? File.basename(seminar_signup_contribute.file.path) : seminar_signup_contribute.title) , seminar_signup_contribute.file.url, {:target => '_blank', :title => seminar_signup_contribute.description} if seminar_signup_contribute.file.file <li><%= link_to (seminar_signup_contribute.title.blank? ? File.basename(seminar_signup_contribute.file.path) : seminar_signup_contribute.title) , seminar_signup_contribute.file.url, {:target => '_blank'} if seminar_signup_contribute.file.file %>
%></li> </li>
<% end %> <% end %>
</ul>
</td> </td>
</tr> </tr>
<% end %> <% end %>

2
app/views/seminars/con_upload.html.erb
View File

@ -31,7 +31,7 @@
%> %>
<tr> <tr>
<td><%= seminar_signup_contribute.title %></td> <td><%= seminar_signup_contribute.title %></td>
<td><%= seminar_signup_contribute.description %></td> <td><%= seminar_signup_contribute.description.to_s.html_safe %></td>
<td><%= link_to (seminar_signup_contribute.title.blank? ? File.basename(seminar_signup_contribute.file.path) : seminar_signup_contribute.title) , seminar_signup_contribute.file.url, {:target => '_blank', :title => seminar_signup_contribute.description} if seminar_signup_contribute.file.file %></td> <td><%= link_to (seminar_signup_contribute.title.blank? ? File.basename(seminar_signup_contribute.file.path) : seminar_signup_contribute.title) , seminar_signup_contribute.file.url, {:target => '_blank', :title => seminar_signup_contribute.description} if seminar_signup_contribute.file.file %></td>
<td> <td>
<%= link_to t(:edit), OrbitHelper.url_to_show(@seminar.to_param) + '?method=edit_file&con_no=' + seminar_signup_contribute.id, :class => 'btn btn-primary' %> <%= link_to t(:edit), OrbitHelper.url_to_show(@seminar.to_param) + '?method=edit_file&con_no=' + seminar_signup_contribute.id, :class => 'btn btn-primary' %>

1
app/views/seminars/edit_file.html.erb
View File

@ -1,4 +1,5 @@
<% # encoding: utf-8 %> <% # encoding: utf-8 %>
<%= stylesheet_link_tag "lib/jquery-ui-1.12.1/jquery-ui.min.css" %>
<%= javascript_include_tag 'basic.js' %> <%= javascript_include_tag 'basic.js' %>
<% <%
data = action_data data = action_data