Fix bug.
This commit is contained in:
parent
becc66f769
commit
b00ed0213e
|
|
@ -1,19 +1,64 @@
|
|||
<% @writing_journals.each do |writing_journal| %>
|
||||
<tr id="<%= dom_id writing_journal %>" class="with_action">
|
||||
<td class="span1"><%= writing_journal.year %></td>
|
||||
<td class="span1">
|
||||
<a href="<%= OrbitHelper.url_to_plugin_show(writing_journal.to_param,'personal_journal').to_s %>" target="blank">
|
||||
<span>
|
||||
<%= "#{Nokogiri::HTML(writing_journal.create_link).text}" %>
|
||||
</span>
|
||||
</a>
|
||||
<div class="quick-edit">
|
||||
<ul class="nav nav-pills hide">
|
||||
<li><%= link_to t('edit').to_s, edit_admin_journal_paper_path(writing_journal) %></li>
|
||||
<li><%= link_to t(:delete_), admin_journal_paper_path(id: writing_journal.id), method: :delete, remote: true, data: { confirm: 'Are you sure?' } %></li>
|
||||
</ul>
|
||||
<table class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span1"><%= t('personal_journal.year') %></th>
|
||||
<th class="span7"><%= t('module_name.journal_paper') %></th>
|
||||
<th class="span1"><%= t("personal_plugins.author") %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tbody_writing_journals" class="sort-holder">
|
||||
<% @writing_journals.each do |writing_journal| %>
|
||||
<tr id="<%= dom_id writing_journal %>" class="with_action">
|
||||
<td class="span1"><%= writing_journal.year %></td>
|
||||
<td class="span1">
|
||||
<a href="<%= OrbitHelper.url_to_plugin_show(writing_journal.to_param,'personal_journal').to_s %>" target="blank">
|
||||
<span>
|
||||
<%= "#{Nokogiri::HTML(writing_journal.create_link).text}" %>
|
||||
</span>
|
||||
</a>
|
||||
<div class="quick-edit">
|
||||
<ul class="nav nav-pills hide">
|
||||
<li><%= link_to t('edit').to_s, edit_admin_journal_paper_path(writing_journal) %></li>
|
||||
<li><%= link_to t(:delete_), admin_journal_paper_path(id: writing_journal.id), method: :delete, remote: true, data: { confirm: 'Are you sure?' } %></li>
|
||||
</ul>
|
||||
</div>
|
||||
</td>
|
||||
<td><%= get_member_show(writing_journal).html_safe %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="bottomnav clearfix">
|
||||
<div class="action pull-right">
|
||||
<div class="dropup upload-button">
|
||||
<button class="btn btn-primary" type="button" onclick="MergeUrl()">
|
||||
<i class="far fa-object-group"></i>
|
||||
<span class="group"></span><%= t('personal_journal.merge') %>
|
||||
</button>
|
||||
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
|
||||
<i class="icon-upload-alt icon-white"></i><%= t('personal_journal.upload') %>
|
||||
<span class="caret"></span>
|
||||
</button>
|
||||
<div class="dropdown-menu upload-box">
|
||||
<form action="/admin/journal_papers/import_from_excel" method="post" enctype="multipart/form-data">
|
||||
<%= hidden_field_tag :authenticity_token, form_authenticity_token %>
|
||||
<input type="file" name="import_file" >
|
||||
<button class="btn btn-primary" type="submit"><%= t(:submit) %></button>
|
||||
<a class="" href="/admin/journal_papers/download_excel_format.xlsx">Download excel format</a>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td><%= get_member_show(writing_journal).html_safe %></td>
|
||||
</tr>
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:new_), new_admin_journal_paper_path, :class => 'btn btn-primary' %>
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), admin_writing_journal_setting_path, :class => 'btn btn-primary pull-right' %>
|
||||
</div>
|
||||
<div class="pagination pagination-centered">
|
||||
<%= content_tag :div, paginate(@writing_journals), class: "pagination pagination-centered" %>
|
||||
</div>
|
||||
</div>
|
||||
<% if params[:error] == "1" %>
|
||||
<script type="text/javascript">
|
||||
alert("File cannot be imported. File has more than 500 entries. Please seperate the entries in different files.");
|
||||
window.location.href = "<%= admin_journal_papers_url %>";
|
||||
</script>
|
||||
<% end %>
|
||||
|
|
@ -5,49 +5,6 @@ function MergeUrl(){
|
|||
}
|
||||
</script>
|
||||
<%= render_filter nil, "tbody_writing_journals" %>
|
||||
<table class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span1"><%= t('personal_journal.year') %></th>
|
||||
<th class="span7"><%= t('module_name.journal_paper') %></th>
|
||||
<th class="span1"><%= t("personal_plugins.author") %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tbody_writing_journals" class="sort-holder">
|
||||
<%= render 'writing_journal' %>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="bottomnav clearfix">
|
||||
<div class="action pull-right">
|
||||
<div class="dropup upload-button">
|
||||
<button class="btn btn-primary" type="button" onclick="MergeUrl()">
|
||||
<i class="far fa-object-group"></i>
|
||||
<span class="group"></span><%= t('personal_journal.merge') %>
|
||||
</button>
|
||||
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
|
||||
<i class="icon-upload-alt icon-white"></i><%= t('personal_journal.upload') %>
|
||||
<span class="caret"></span>
|
||||
</button>
|
||||
<div class="dropdown-menu upload-box">
|
||||
<form action="/admin/journal_papers/import_from_excel" method="post" enctype="multipart/form-data">
|
||||
<%= hidden_field_tag :authenticity_token, form_authenticity_token %>
|
||||
<input type="file" name="import_file" >
|
||||
<button class="btn btn-primary" type="submit"><%= t(:submit) %></button>
|
||||
<a class="" href="/admin/journal_papers/download_excel_format.xlsx">Download excel format</a>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:new_), new_admin_journal_paper_path, :class => 'btn btn-primary' %>
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), admin_writing_journal_setting_path, :class => 'btn btn-primary pull-right' %>
|
||||
</div>
|
||||
<div class="pagination pagination-centered">
|
||||
<%= content_tag :div, paginate(@writing_journals), class: "pagination pagination-centered" %>
|
||||
</div>
|
||||
</div>
|
||||
<% if params[:error] == "1" %>
|
||||
<script type="text/javascript">
|
||||
alert("File cannot be imported. File has more than 500 entries. Please seperate the entries in different files.");
|
||||
window.location.href = "<%= admin_journal_papers_url %>"
|
||||
</script>
|
||||
<% end %>
|
||||
<span id="index_table">
|
||||
<%= render 'writing_journal' %>
|
||||
</span>
|
||||
|
|
@ -1,3 +1 @@
|
|||
$("#sort_headers").html("<%= j render 'sort_headers' %>");
|
||||
$("#tbody_writing_journals").html("<%= j render :partial => 'writing_journal', :collection => @writing_journals %>");
|
||||
$("#writing_journal_pagination").html("<%= j paginate @writing_journals, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>");
|
||||
$("#index_table").html("<%= j render :partial => 'writing_journal', :collection => @writing_journals %>");
|
||||
Loading…
Reference in New Issue