From 61b759b7395233bd9394aaeb4901cfa47b5fd869 Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Sat, 18 Jul 2015 10:15:36 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/my_controller.rb | 2 +- app/views/users/show.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index 84e2e7d35..a89ae846e 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -200,7 +200,7 @@ class MyController < ApplicationController flash.now[:error] = l(:notice_account_wrong_password) end end - render :template => 'my/account',:layout=>'base_users_new' + #render :template => 'my/account',:layout=>'base_users_new' rescue Exception => e if e.message == 'wrong password' flash.now[:error] = l(:notice_account_wrong_password) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 3bf7d8118..003555158 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -36,7 +36,7 @@

取消 - 发布 + 留言
From 59c1810d6b7c654fe8670927574389a4f62d20eb Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Sat, 18 Jul 2015 10:55:12 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 13 ++++++------- app/views/users/show.html.erb | 4 ++++ app/views/users/user_courses4show.html.erb | 2 +- app/views/users/user_projects4show.html.erb | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index cb2821a4b..d6597f3da 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -142,7 +142,7 @@ class UsersController < ApplicationController @obj_count = query.count(); @obj_pages = Paginator.new @obj_count,limit,params['page'] - @list = query.order("#{Project.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all(); + @list = query.order("#{Project.table_name}.updated_on desc,#{Project.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all(); @params = params respond_to do |format| @@ -281,7 +281,7 @@ class UsersController < ApplicationController @obj_count = query.count(); @obj_pages = Paginator.new @obj_count,limit,params['page'] - @list = query.order("#{Course.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all(); + @list = query.order("#{Course.table_name}.updated_at desc,#{Course.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all(); @params = params render :layout=>'base_users_new' @@ -460,14 +460,13 @@ class UsersController < ApplicationController end if params[:lastid]!=nil && !params[:lastid].empty? - query = query.where("#{Course.table_name}.id < ?",params[:lastid]) + query = query.where("( (#{Course.table_name}.updated_at=? and #{Course.table_name}.id < ?) or #{Course.table_name}.updated_atnil end def user_projects4show - query = Project.joins("join members m on #{Project.table_name}.id=m.project_id") query = query.where("m.user_id = ? and #{Project.table_name}.project_type=?",@user.id,Project::ProjectType_project) if User.current == @user #看自己 @@ -477,9 +476,9 @@ class UsersController < ApplicationController end if params[:lastid]!=nil && !params[:lastid].empty? - query = query.where("#{Project.table_name}.id < ?",params[:lastid]) + query = query.where("( (#{Project.table_name}.updated_on=? and #{Project.table_name}.id < ?) or #{Project.table_name}.updated_onnil end diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 003555158..ab3bf9f73 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -273,6 +273,10 @@ if($("div[nhname='rec']",p.container).length > 0){ var lastid = $("div[nhname='rec']",p.container).filter(':last').data('id'); url += "?lastid="+lastid; + var lasttime = $("div[nhname='rec']",p.container).filter(':last').data('time'); + if(lasttime != undefined){ + url += "&lasttime="+lasttime; + } } $.ajax( {url:url,dataType:'text',success:function(data){ var html = $("
"+data+"
"); diff --git a/app/views/users/user_courses4show.html.erb b/app/views/users/user_courses4show.html.erb index d83ba8a8b..7aab1b2a5 100644 --- a/app/views/users/user_courses4show.html.erb +++ b/app/views/users/user_courses4show.html.erb @@ -1,6 +1,6 @@ <% for item in @list %> -
+
item.id, :host=>Setting.host_course) %>"><%= image_tag(url_to_avatar(item), :style => 'width:64px;height:64px;') %>
diff --git a/app/views/users/user_projects4show.html.erb b/app/views/users/user_projects4show.html.erb index 7435a1d14..3c709bd5d 100644 --- a/app/views/users/user_projects4show.html.erb +++ b/app/views/users/user_projects4show.html.erb @@ -1,5 +1,5 @@ <% for item in @list %> -
+
item.id, :host=>Setting.host_name) %>"><%= image_tag(url_to_avatar(item), :style => 'width:64px;height:64px;') %>
From 32ef798b073ab5d6f190816a9afeae6ca7b0b473 Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Sat, 18 Jul 2015 11:04:03 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users_new.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index 8aca387c6..ef6d82245 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -183,9 +183,9 @@ $(".subNav").click(function(){ <% end %> <% if (@user.user_extensions.identity == 0 || @user.user_extensions.identity == 1) && !@user.user_extensions.school.nil? %> -
  • <%= @user.user_extensions.school.name %>
    • +
  • <%= @user.user_extensions.school.name %>
    • <% elsif @user.user_extensions.identity == 3 && !@user.user_extensions.occupation.nil? && !@user.user_extensions.occupation.empty? %> -
  • <%= @user.user_extensions.occupation %>
    • +
  • <%= @user.user_extensions.occupation %>
    • <% elsif @user.user_extensions.identity == 2 %>
  • <%= @user.show_name %>
    • <% end %> From 8ca744479219ffb30c2e91ffba907fa9937a7fc8 Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Sat, 18 Jul 2015 11:36:12 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/my/account.html.erb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 96e3cf995..f17f0306f 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -145,7 +145,7 @@
  • <%= f.select :language, :Chinese => :zh, :English => :en %>
  • - 确认 + 确认
    • @@ -169,7 +169,7 @@
  • 请输入6-12个字符
  • - 确认 + 确认
    • @@ -528,6 +528,12 @@ <% if( !@act.nil? && @act == 'password') %> $("#users_tb_2").click(); <% end %> + $('#my_account_form_link').click(function(){ + $('#my_account_form_btn').click(); + }); + $('#my_password_form_link').click(function(){ + $('#my_password_form_btn').click(); + }); });