Compare commits
2 Commits
Author | SHA1 | Date |
---|---|---|
spen | 481a12eb53 | |
Manson Wang | 994df1bf2c |
|
@ -226,7 +226,13 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
|
|||
|
||||
respond_to do |format|
|
||||
if @writing_conference.update_attributes(params[:writing_conference])
|
||||
format.html { redirect_to(panel_personal_conference_back_end_writing_conferences_url) }
|
||||
|
||||
if params[:writing_conference][:user_id]
|
||||
format.html { redirect_to(admin_users_new_interface_url(:id=>params[:writing_conference][:user_id],:show_plugin_profile=>'WritingConference')) }
|
||||
else
|
||||
format.html { redirect_to(panel_personal_conference_back_end_writing_conferences_url) }
|
||||
end
|
||||
|
||||
# format.js { render 'toggle_enable' }
|
||||
format.xml { head :ok }
|
||||
else
|
||||
|
@ -246,7 +252,13 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
|
|||
@writing_conference.destroy
|
||||
|
||||
respond_to do |format|
|
||||
format.html { redirect_to(panel_personal_conference_back_end_writing_conferences_url) }
|
||||
|
||||
if params[:user_id]
|
||||
format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>'WritingConference')) }
|
||||
else
|
||||
format.html { redirect_to(panel_personal_conference_back_end_writing_conferences_url) }
|
||||
end
|
||||
|
||||
# format.xml { head :ok }
|
||||
format.js
|
||||
end
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
<% # encoding: utf-8 %>
|
||||
|
||||
<div class="writing_detail">
|
||||
<table>
|
||||
<caption> <%= t("module_name.personal_conference") %> </caption>
|
||||
<tbody>
|
||||
|
@ -55,7 +56,9 @@
|
|||
<tr><th><%= t("personal_conference.url")%></th><td><%= link_to t(:url), @writing_conference.url, {:target => '_blank', :title => @writing_conference.url} if !@writing_conference.url.blank? %></td></tr>
|
||||
<% end %>
|
||||
|
||||
<tr><th><%= t("personal_conference.authors")%></th><td><%= "#{User.from_id(@writing_conference.create_user_id).name rescue ''},#{@personal_conference.authors rescue ''}"%></td></tr>
|
||||
<% if !@writing_conference.authors.blank? %>
|
||||
<tr><th><%= t("personal_conference.authors")%></th><td><%= "#{@writing_conference.authors rescue ''}"%></td></tr>
|
||||
<% end %>
|
||||
|
||||
<% if @writing_conference.writing_conference_files.size > 0 %>
|
||||
<tr><th><%= t("personal_conference.file")%></th>
|
||||
|
@ -73,3 +76,4 @@
|
|||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
|
|
@ -41,11 +41,11 @@
|
|||
</div>
|
||||
<% end -%>
|
||||
|
||||
<table class="table table-condensed table-striped">
|
||||
<table class="table table-condensed table-striped main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<% if is_admin? %>
|
||||
<th><input type="checkbox" class="list-check" /></th>
|
||||
<th><input type="checkbox" /></th>
|
||||
<% end -%>
|
||||
<th class="span1"><%= t('personal_conference.year') %></th>
|
||||
<th><%= t('module_name.personal_conference') %></th>
|
||||
|
@ -55,7 +55,7 @@
|
|||
|
||||
<% @writing_conferences.each do |writing_conference| %>
|
||||
|
||||
<tr class="<%= writing_conference.is_hidden ? "checkHide" : "" %>">
|
||||
<tr id="<%= dom_id writing_conference %>" class="<%= writing_conference.is_hidden ? "checkHide" : "" %>">
|
||||
<% if is_admin? %>
|
||||
<td>
|
||||
<%= check_box_tag 'to_change[]', writing_conference.id.to_s, false, :class => "list-check" %>
|
||||
|
@ -64,6 +64,14 @@
|
|||
<td><%= writing_conference.year %></td>
|
||||
<td>
|
||||
<%= link_to writing_conference.create_link, panel_personal_conference_front_end_writing_conference_path(writing_conference) %>
|
||||
<div class="quick-edit">
|
||||
<ul class="nav nav-pills hide">
|
||||
<%if at_least_module_manager || writing_conference.writing_conference_category.cur_user_is_sub_manager_of(:edit)%>
|
||||
<li><%= link_to t('edit'), edit_panel_personal_conference_back_end_writing_conference_path(writing_conference,:user_id => @user.id) %></li>
|
||||
<li><%= link_to t(:delete_), panel_personal_conference_back_end_writing_conference_path(writing_conference,:user_id => @user.id), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
|
||||
<% end -%>
|
||||
</ul>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
|
Loading…
Reference in New Issue