个人主页
This commit is contained in:
parent
61b759b739
commit
59c1810d6b
|
@ -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_at<?)",params[:lasttime],params[:lastid],params[:lasttime])
|
||||
end
|
||||
@list = query.order("#{Course.table_name}.id desc").limit(8).all
|
||||
@list = query.order("#{Course.table_name}.updated_at desc,#{Course.table_name}.id desc").limit(8).all
|
||||
|
||||
render :layout=>nil
|
||||
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_on<?)",params[:lasttime],params[:lastid],params[:lasttime])
|
||||
end
|
||||
@list = query.order("#{Project.table_name}.id desc").limit(8).all
|
||||
@list = query.order("#{Project.table_name}.updated_on desc,#{Project.table_name}.id desc").limit(8).all
|
||||
|
||||
render :layout=>nil
|
||||
end
|
||||
|
|
|
@ -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 = $("<div>"+data+"</div>");
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<% for item in @list %>
|
||||
|
||||
<div class="home_courses_list fl" nhname="rec" data-id="<%= item.id %>">
|
||||
<div class="home_courses_list fl" nhname="rec" data-id="<%= item.id %>" data-time="<%= item.updated_at %>">
|
||||
<div class="courses_list_pic fl ml10 mr10">
|
||||
<a href="<%= url_for(:controller => 'courses', :action=>"show", :id=>item.id, :host=>Setting.host_course) %>"><%= image_tag(url_to_avatar(item), :style => 'width:64px;height:64px;') %></a>
|
||||
</div>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<% for item in @list %>
|
||||
<div class="home_courses_list fl" nhname="rec" data-id="<%= item.id %>">
|
||||
<div class="home_courses_list fl" nhname="rec" data-id="<%= item.id %>" data-time="<%= item.updated_on %>">
|
||||
<div class="courses_list_pic fl ml10 mr10">
|
||||
<a href="<%= url_for(:controller => 'projects', :action=>"show", :id=>item.id, :host=>Setting.host_name) %>"><%= image_tag(url_to_avatar(item), :style => 'width:64px;height:64px;') %></a>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue