fix member show fields

app/assets/javascripts/admin/filemanager.js

@@ -69,7 +69,7 @@ $(document).ready(function(){
 		$("input[type=checkbox]:checked").each(function(){
 			items_to_delete.push($(this).val());
 		})
-		$.post("<%= delete_files_admin_assets_path %>",{"files":items_to_delete,"type":type},function(){
+		$.post("/admin/assets/delete_files",{"files":items_to_delete,"type":type},function(){
 			deleteBtn.hide();
 		})
 	})

app/controllers/admin/import_data_controller.rb

@@ -396,12 +396,6 @@ class Admin::ImportDataController < OrbitBackendController
 
            @journal_paper.create_user_id = @user.id
            @journal_paper.save!
-            respond_to do |format|
-          
-              format.html
-              format.json { render json: {"success"=>true}.to_json}
-            
-            end
         end
       end
      

app/controllers/admin/users_new_interface_controller.rb

@@ -261,7 +261,7 @@ class Admin::UsersNewInterfaceController <  OrbitMemberController
         if to_go > 0
           user_at_position = User.where(position: to_go - 1).first
           user = User.find(pair[1])
-          if user_at_position && !user_at_position == user
+          if user_at_position && !(user_at_position == user)
             if user.position > user_at_position.position
               user.move_above(user_at_position)
             else

app/views/layouts/_right_menu.html.erb

@@ -33,7 +33,7 @@
         <ul class="dropdown-menu" role="menu" aria-labelledby="orbit-user">
           <li><%= link_to content_tag(:i, nil, class: 'icons-tools') + ' ' +  t(:account_settings), desktop_path + "#settings-account", tabindex: '-1' %></li>
           <li><%= link_to content_tag(:i, nil, class: 'icons-screen') + ' ' +  t(:desktop), desktop_path, tabindex: '-1' %></li>
-          <li><%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' +  t(:logout), destroy_user_session_path, tabindex: '-1' %></li>
+          <li><%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' +  t(:logout), user_logout_path, tabindex: '-1' %></li>
           <li class="divider"></li>
           <li><a tabindex="-1" href="#"><i class="icons-lifebuoy"></i> <%= t(:help) %></a></li>
         </ul>

lib/orbit_tag/taggable.rb

@@ -46,7 +46,7 @@ module OrbitTag
 
       def tags=(tag_ids)
         tag_ids = [tag_ids].flatten
-        tag_ids.delete('')
+        tag_ids.delete_if{|e| e.match(/^[0-1]$|^$/)}
         ids = self.taggings.blank? ? [] : self.taggings.map{|t| t.tag.id}
         tag_ids.each do |tag_id|
           unless ids.include? tag_id

vendor/built_in_modules/announcement/init.rb

@@ -23,7 +23,7 @@ module Announcement
     end
 
     # category ["BulletinCategory"]
-    data_count 3..10
+    data_count 1..10
 
     authorizable
     approvable
@@ -37,7 +37,7 @@ module Announcement
         image :image
         field :postdate
         link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self}
-        link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:bulletin_category,:id]}}
+        link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:category,:id]}}
         field :subtitle
         link_to_more 'panel_announcement_front_end_bulletins_path',:title_i18n=> 'more_plus'
       end

vendor/built_in_modules/faq/init.rb

@@ -27,7 +27,7 @@ module Faq
       default_widget do
         query 'Qa.all'
         # enable ['typeA']
-        link_field :qa_category_with_title,{:method => 'panel_faq_front_end_qas_path',:args=>{:category_id => [:qa_category,:id]}}
+        link_field :qa_category_with_title,{:method => 'panel_faq_front_end_qas_path',:args=>{:category_id => [:category,:id]}}
         link_field :title, {:method => 'panel_faq_front_end_qa_path',:args=>:self}
         link_to_more 'panel_faq_front_end_qas_path',:title_i18n=> 'faq.default_widget.to_more'
       end

vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_office_field.html.erb

@@ -0,0 +1,30 @@
+   <% show_office_field.attribute_fields.where(:disabled=>false).asc(:_id).each do |rf| %>
+
+                  <% 
+                    if !@member.get_attribute_value(rf).blank?
+                      if !@member.get_attribute_value(rf)['val'].blank?
+                        @rodata = @member.get_attribute_value(rf)['val']
+                      elsif !@member.get_attribute_value(rf)[I18n.locale].blank?
+                        @rodata = @member.get_attribute_value(rf)[I18n.locale]
+                      else
+                        @rodata = nil
+                      end
+
+                    if !@rodata.blank? and !@member.get_attribute_value(rf).get_value_by_locale(I18n.locale).blank?
+                  %>
+
+                    <tr>
+                    <% if (rf.title == "Office" || rf.title == "研究室")%>
+                      <td><%= rf.title %></td>
+                      <td><%= nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %></td>
+                      </tr>
+                     <%end%>
+
+                    </tr>
+
+                    <% end -%>
+
+                  <% end -%>
+                  
+                <% end -%>
+

vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_research_field.html.erb

@@ -14,7 +14,7 @@
                   %>
 
                     <tr>
-                    <% if rf.title == "Research Field"%>
+                    <% if (rf.title == "Research Field"|| rf.title == "研究領域")%>
                       <td><%= rf.title %></td>
                       <td><%= nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %></td>
                       </tr>

vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_roles.html.erb

@@ -1,26 +1,3 @@
-          <!--       <% 
-                  @status = @member.role_statuses.where(:role_id=>show_roles.id)
-
-                  if !@status.blank?
-                %>
-                <tr>
-                  <td><%= t('status')%></td>
-                  <td><%= show_attribute_value(@member.role_statuses.where(:role_id=>show_roles.id).map{|t|t.title.to_s}.join(',')) rescue '' %></td>
-                </tr>
-
-                <% end -%> -->
-
-                <% 
-                  @category = @member.role_categorys.where(:role_id=>show_roles.id)
-
-                  if !@category.blank?
-                %>
-                <tr>
-                  <td><%= t('category')%></td>
-                  <td><%= show_attribute_value(@member.role_categorys.where(:role_id=>show_roles.id).map{|t|t.title.to_s}.join(',')) rescue '' %></td>
-                </tr>
-
-                <% end -%>
 
                 <% show_roles.attribute_fields.where(:disabled=>false).asc(:_id).each do |rf| %>
 
@@ -34,16 +11,12 @@
                         @rodata = nil
                       end
 
-                    if !@rodata.blank? and !@member.get_attribute_value(rf).get_value_by_locale(I18n.locale).blank?
+                    if !@rodata.blank? and !@member.get_attribute_value(rf).get_value_by_locale(I18n.locale).blank? and rf.key != 'job_title'
                   %>
 
                     <tr>
-                    <% if rf.title != "Research Field"%>
                       <td><%= rf.title %></td>
                       <td><%= nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %></td>
-                      </tr>
-                     <%end%>
-
                     </tr>
 
                     <% end -%>

vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb

@@ -1,5 +1,5 @@
 <% # encoding: utf-8 %>
-<!-- useless comment -->
+
 			<section> 
 
 				<div class="side"></div>

vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb

@@ -3,28 +3,41 @@
 		<table>
 			<tbody>
 
-				<%= render :partial=> "show_roles",:collection=>@member.roles.asc(:created_at) %>
+                <% 
+                  @member_role = @member.roles.asc(:created_at).first
+                  @category = @member.role_categorys.where(:role_id=>@member_role.id)
 
+                  if !@category.blank?
+                %>
+                <tr>
+                  <td><%= t('category')%></td>
+                  <td><%= show_attribute_value(@member.role_categorys.where(:role_id=>@member_role.id).map{|t|t.title.to_s}.join(',')) rescue '' %></td>
+                </tr>
+
+                <% end -%>				
+
+				<% @job_title = show_attribute_value(User.get_member_list_attribute_value(@member.id,"teacher","job_title").get_value_by_locale(I18n.locale))
+				   if @job_title != 'NoData' and !@job_title.blank?
+				%>
+				<tr>
+					<td><%= User.get_member_list_attribute_field_name("teacher","job_title") %></td>
+					<td><%= @job_title %></td>
+				</tr>
+				<% end -%>
 				<tr>
 					<td><%= t('users.name')%></td>
 					<td><%= @member.name%></td>
 				</tr>
-				<% if !@member.email_hidden? %>
 				<tr>
 					<td><%= t('users.email')%></td>
 					<td><a href="mailto:<%= @member.email %>"><%= @member.email %></a></td>
 				</tr>
-				<% end %>
 				<% if !@member.office_tel.blank? %>
 				<tr>
 					<td><%= t('users.office_tel')%></td>
 					<td><%= @member.office_tel%></td>
 				</tr>
 				<% end %>
-				<tr>
-					<td><%= t('users.sex')%></td>
-					<td><%= t("users.#{@member.sex}") %></td>
-				</tr>
 
 				<% @profile_data.each do |item| %>
 				<% if !item[:value].blank? %>
@@ -34,8 +47,8 @@
 				</tr>
 				<% end -%>
 				<% end -%>
-				
-				<%= render :partial=> "show_research_field",:collection=>@member.roles.asc(:created_at) %>
+
+				<%= render :partial=> "show_roles",:collection=>@member.roles.asc(:created_at) %>
 
 			</tbody>
 		</table>
@@ -58,14 +71,13 @@
 					<% if !@intro_data.blank? %>
 
 						<% if !@intro_data.brief_intro.blank? or !@intro_data.complete_list.blank? %>
-						  <li><a href="#<%= plugin.name.gsub(' ', '') %>"><%= plugin.name %></a></li>
-
+						  <li><a href="#<%= plugin["name"].gsub(' ', '') %>"><%= plugin["name"] %></a></li>
 						<% end %>
 
 					<% else %>
 
 						<% if !@data.blank? %>
-						  <li><a href="#<%= plugin.name.gsub(' ', '') %>"><%= plugin.name %></a></li>
+						  <li><a href="#<%= plugin["name"].gsub(' ', '') %>"><%= plugin["name"] %></a></li>
 						<% end %>
 
 					<% end %>
@@ -86,9 +98,7 @@
 				<% if !@intro_data.blank? %>
 
 					<% if !@intro_data.brief_intro.blank? or !@intro_data.complete_list.blank? %>
-
-						<div class="module-pane" id="<%= plugin.name.gsub(' ', '') %>">
-
+						<div class="module-pane" id="<%= plugin["name"].gsub(' ', '') %>">
 							<%= render :partial => @plugin_partial if !@plugin_partial.blank? %>
 						</div>					
 					<% end %>
@@ -96,8 +106,7 @@
 				<% else %>
 
 					<% if !@data.blank? %>
-						<div class="module-pane" id="<%= plugin.name.gsub(' ', '') %>">
-
+						<div class="module-pane" id="<%= plugin["name"].gsub(' ', '') %>">
 							<%= render :partial => @plugin_partial if !@plugin_partial.blank? %>
 						</div>					
 					<% end %>

vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/front_end/writing_conferences_controller.rb

@@ -0,0 +1,26 @@
+class Panel::PersonalConference::FrontEnd::WritingConferencesController < OrbitWidgetController
+
+  def initialize
+    super
+    @app_title = 'personal_conference'
+  end
+  
+
+  def index
+	
+	@writing_conferences = WritingConference.desc(:year).page(params[:page]).per(10)
+	
+  end
+
+  # GET /writing_conferences/1
+  # GET /writing_conferences/1.xml
+  def show
+    @writing_conference = WritingConference.find(params[:id])
+	
+	@conference_paper_types = ( !@writing_conference.conference_paper_types.blank? ? @writing_conference.conference_paper_types.collect{|x| x.title}.join(', ') : nil)
+	@conference_author_types = ( !@writing_conference.conference_author_types.blank? ? @writing_conference.conference_author_types.collect{|x| x.title}.join(', ') : nil)
+  
+  end
+  
+  
+end