From b00ed0213ef8755131f9ca4d32534b93da9fa540 Mon Sep 17 00:00:00 2001
From: BoHung Chiu <bohung@rulingcom.com>
Date: Fri, 14 Jul 2023 18:12:06 +0800
Subject: [PATCH] Fix bug.

---
 .../journal_papers/_writing_journal.html.erb  | 79 +++++++++++++++----
 app/views/admin/journal_papers/index.html.erb | 49 +-----------
 app/views/admin/journal_papers/index.js.erb   |  4 +-
 3 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/app/views/admin/journal_papers/_writing_journal.html.erb b/app/views/admin/journal_papers/_writing_journal.html.erb
index 7d75350..a0ea509 100644
--- a/app/views/admin/journal_papers/_writing_journal.html.erb
+++ b/app/views/admin/journal_papers/_writing_journal.html.erb
@@ -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 %>
\ No newline at end of file
diff --git a/app/views/admin/journal_papers/index.html.erb b/app/views/admin/journal_papers/index.html.erb
index 7572e16..47bdb15 100644
--- a/app/views/admin/journal_papers/index.html.erb
+++ b/app/views/admin/journal_papers/index.html.erb
@@ -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 %>
\ No newline at end of file
+<span id="index_table">
+	<%= render 'writing_journal' %>
+</span>
\ No newline at end of file
diff --git a/app/views/admin/journal_papers/index.js.erb b/app/views/admin/journal_papers/index.js.erb
index 6218673..bd124e8 100644
--- a/app/views/admin/journal_papers/index.js.erb
+++ b/app/views/admin/journal_papers/index.js.erb
@@ -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} %>");
\ No newline at end of file
+$("#index_table").html("<%= j render :partial => 'writing_journal', :collection => @writing_journals %>");
\ No newline at end of file