diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 1839dd1fd..4124472e1 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -137,7 +137,7 @@ class MyController < ApplicationController
@se.identity = params[:identity].to_i if params[:identity]
@se.technical_title = params[:technical_title] if params[:technical_title]
@se.student_id = params[:no] if params[:no]
- @se.brief_introduction = params[:brief_introduction]
+ # @se.brief_introduction = params[:brief_introduction]
@se.description = params[:description]
if @user.save && @se.save
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index c23266afd..23fc1a3ad 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -30,7 +30,7 @@
工作单位 :
地区 :
邮件通知 :
- 个人签名 :
+
个人简介 :
@@ -141,7 +141,7 @@
<%= select_tag( 'user[mail_notification]', options_for_select( user_mail_notification_options(@user), @user.mail_notification) ) %>
-
+
<%= f.select :language, :Chinese => :zh, :English => :en %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index e650130ff..d0e8351ee 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -3,7 +3,8 @@
if ($(window).scrollTop() == $(document).height() - $(window).height()) {
$.get(
'<%= user_activities_path(@user.id)%>',
- { page : $("#show_more_activities").val()},
+ { page : $("#show_more_activities").val(),
+ type: $("#user_activities_type").val()},
function (data) {
}
@@ -13,6 +14,7 @@
$(window).scroll(scrollHandler);
+