ntu_mb

app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb

@@ -226,13 +226,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
 
       respond_to do |format|
         if @writing_conference.update_attributes(params[:writing_conference])
-    
-          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.html { redirect_to(panel_personal_conference_back_end_writing_conferences_url) }
       		# format.js  { render 'toggle_enable' }
           format.xml  { head :ok }
         else
@@ -252,13 +246,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
     @writing_conference.destroy
 
     respond_to do |format|
-    
-      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.html { redirect_to(panel_personal_conference_back_end_writing_conferences_url) }
       # format.xml  { head :ok }
       format.js
     end

app/models/writing_conference.rb

@@ -91,6 +91,8 @@ class WritingConference
     if !self.publication_date.nil?
       pd = self.publication_date.strftime("%Y-%m-%d").split('-')
       title << pd[0]
+    elsif !self.year.blank?
+      title << self.year
     end
 
     title << self.paper_title if self.paper_title.present?

app/views/panel/personal_conference/front_end/writing_conferences/show.html.erb

@@ -1,6 +1,5 @@
 <% # encoding: utf-8 %>
 
-<div class="writing_detail">
 <table>
 	<caption> <%= t("module_name.personal_conference") %> </caption>
 	<tbody>
@@ -56,9 +55,7 @@
 		<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 %>
 
-		<% if !@writing_conference.authors.blank? %>
-		<tr><th><%= t("personal_conference.authors")%></th><td><%= "#{@writing_conference.authors rescue ''}"%></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.writing_conference_files.size > 0 %>
 		<tr><th><%= t("personal_conference.file")%></th>
@@ -76,4 +73,3 @@
 		<% end %>
 	</tbody>
 </table>
-</div>

app/views/panel/personal_conference/plugin/_profile.html.erb

@@ -41,7 +41,7 @@
 </div>
 <% end -%>
 
-<table class="table table-condensed table-striped main-list">
+<table class="table table-condensed table-striped">
   <thead>
     <tr>
       <% if is_admin? %>
@@ -55,7 +55,7 @@
 		
 	<% @writing_conferences.each do |writing_conference| %>	
 			
-    <tr id="<%= dom_id writing_conference %>" class="<%= writing_conference.is_hidden ? "checkHide" : "" %>">
+    <tr 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,14 +64,6 @@
 			<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>		
 		
@@ -83,8 +75,9 @@
 <% if is_admin? %>
 <div class="bottomnav clearfix">
 	<div class="action pull-right">
-    <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_conference_back_end_personal_conference_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %>
-		<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_conference_back_end_writing_conference_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.sync_data'), admin_import_data_sync_conference_data_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_conference_back_end_personal_conference_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_conference_back_end_writing_conference_path(:user_id => @user.id), :class => 'btn btn-primary' %>
 	</div>
 	<div class="pagination pagination-centered">
 		<%= paginate @writing_conferences, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>