Compare commits

..

1 Commits

Author SHA1 Message Date
chiu 74a63e8279 Revert "Update journal_papers_controller.rb"
This reverts commit 0c1a4a7796
2019-11-03 20:05:08 +08:00
2 changed files with 6 additions and 50 deletions

View File

@ -65,7 +65,7 @@ class Admin::JournalPapersController < OrbitMemberController
end end
def new def new
@member = Array(MemberProfile.find_by(:uid=>params['uid'])) rescue nil @member = Array(MemberProfile.find_by(:uid=>params['uid'])) rescue [nil]
@journal_paper = JournalPaper.new @journal_paper = JournalPaper.new
if params[:desktop] if params[:desktop]

View File

@ -4,6 +4,7 @@
<% content_for :page_specific_javascript do %> <% content_for :page_specific_javascript do %>
<%= javascript_include_tag "lib/list-check" %> <%= javascript_include_tag "lib/list-check" %>
<% end %> <% end %>
<% <%
if has_access? if has_access?
@writing_journals = JournalPaper.where(member_profile_id: @member.id).desc(:year).page(params[:page]).per(10) @writing_journals = JournalPaper.where(member_profile_id: @member.id).desc(:year).page(params[:page]).per(10)
@ -11,55 +12,8 @@
@writing_journals = JournalPaper.where(is_hidden: false, member_profile_id: @member.id).desc(:year).page(params[:page]).per(10) @writing_journals = JournalPaper.where(is_hidden: false, member_profile_id: @member.id).desc(:year).page(params[:page]).per(10)
end end
%> %>
<% if has_access? %>
<div class="list-active">
<div class="btn-group">
<%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => toggle_hide_admin_journal_papers_path(member_profile_id: @member.id.to_s, disable: 'true') ) %>
<%= link_to('Show', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-show", :rel => toggle_hide_admin_journal_papers_path(member_profile_id: @member.id.to_s, disable: 'false') ) %>
</div>
</div>
<% end -%>
<table class="table table-condensed table-striped main-list">
<thead>
<tr>
<% if has_access? %>
<th><input type="checkbox" /></th>
<% end -%>
<th class="span1"><%= t('personal_journal.year') %></th>
<th><%= t('module_name.journal_paper') %></th>
<% if not @user%>
<th><%= t('personal_journal.authors') %></th>
<% end %>
</tr>
</thead>
<tbody>
<% @writing_journals.each do |writing_journal| %>
<tr id="<%= dom_id writing_journal %>" class="<%= writing_journal.is_hidden ? "checkHide" : "" %>">
<% if has_access? %>
<td>
<%= check_box_tag 'to_change[]', writing_journal.id.to_s, false, :class => "list-check" %>
</td>
<% end -%>
<td><%= writing_journal.year %></td>
<td>
<%= link_to writing_journal.create_link, OrbitHelper.url_to_plugin_show(writing_journal.to_param,'personal_journal'), target: "blank"%>
<div class="quick-edit">
<ul class="nav nav-pills hide">
<% if has_access? %>
<li><%= link_to t('edit'), '/admin/members/'+@member.to_param+'/journal_papers/'+writing_journal.id+'/edit' %></li>
<li><%= link_to t(:delete_), admin_journal_paper_path(id: writing_journal.id, member_profile_id: @member.id), method: :delete, remote: true, data: { confirm: t('sure?') } %></li>
<% end %>
</ul>
</div>
</td>
<td><%= writing_journal.authors %></td>
</tr>
<% end %>
</tbody>
</table>
<div class="bottomnav clearfix"> <div class="bottomnav clearfix">
<% if has_access? %> <% if has_access? %>
<div class="action pull-right"> <div class="action pull-right">
@ -72,6 +26,7 @@
<%= paginate @writing_journals, :params => {:direction => params[:direction], :sort => params[:sort] } %> <%= paginate @writing_journals, :params => {:direction => params[:direction], :sort => params[:sort] } %>
</div> </div>
</div> </div>
<div id="dialog" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="Delete item" aria-hidden="true"> <div id="dialog" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="Delete item" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
@ -82,3 +37,4 @@
<button class="delete-item btn btn-danger"><%= t(:submit) %></button> <button class="delete-item btn btn-danger"><%= t(:submit) %></button>
</div> </div>
</div> </div>