Changes for side_bar

This commit is contained in:
chris committed 2012-10-15 15:30:48 +08:00
1 parent a50553219e
commit 0babd5f302
36 files changed
+311 -289

No files matched your search

@@ -17,8 +17,11 @@
end
@writing_books = WritingBook.where(:create_user_id => @user.id).page(params[:page]).per(10)
if @user
@writing_books = WritingBook.where(:create_user_id => @user.id).page(params[:page]).per(10)
else
@writing_books = WritingBook.all.page(params[:page]).per(10)
end
%>
@@ -17,8 +17,11 @@
end
@diplomas = Diploma.where(:create_user_id => @user.id).page(params[:page]).per(10)
if @user
@diplomas = Diploma.where(:create_user_id => @user.id).page(params[:page]).per(10)
else
@diplomas = Diploma.all.page(params[:page]).per(10)
end
%>
@@ -17,7 +17,11 @@
end
@experiences = Experience.where(:create_user_id => @user.id).page(params[:page]).per(10)
if @user
@experiences = Experience.where(:create_user_id => @user.id).page(params[:page]).per(10)
else
@experiences = Experience.all.page(params[:page]).per(10)
end
%>
@@ -17,7 +17,11 @@
end
@honors = Honor.where(:create_user_id => @user.id).page(params[:page]).per(10)
if @user
@honors = Honor.where(:create_user_id => @user.id).page(params[:page]).per(10)
else
@honors = Honor.all.page(params[:page]).per(10)
end
%>
@@ -16,9 +16,11 @@
@filter = {new_filter[:type] => [new_filter[:id].to_s]}
end
@writing_journals = WritingJournal.where(:create_user_id => @user.id).page(params[:page]).per(10)
if @user
@writing_journals = WritingJournal.where(:create_user_id => @user.id).page(params[:page]).per(10)
else
@writing_journals = WritingJournal.all.page(params[:page]).per(10)
end
%>
@@ -17,7 +17,11 @@
end
@labs = Lab.where(:create_user_id => @user.id).page(params[:page]).per(10)
if @user
@labs = Lab.where(:create_user_id => @user.id).page(params[:page]).per(10)
else
@labs = Lab.all.page(params[:page]).per(10)
end
%>
@@ -17,7 +17,11 @@
end
@writing_patents = WritingPatent.where(:create_user_id => @user.id).page(params[:page]).per(10)
if @user
@writing_patents = WritingPatent.where(:create_user_id => @user.id).page(params[:page]).per(10)
else
@writing_patents = WritingPatent.all.page(params[:page]).per(10)
end
%>
@@ -17,7 +17,11 @@
end
@projects = Project.where(:create_user_id => @user.id).page(params[:page]).per(10)
if @user
@projects = Project.where(:create_user_id => @user.id).page(params[:page]).per(10)
else
@projects = Project.all.page(params[:page]).per(10)
end
%>
@@ -17,8 +17,11 @@
end
@researchs = Research.where(:create_user_id => @user.id).page(params[:page]).per(10)
if @user
@researchs = Research.where(:create_user_id => @user.id).page(params[:page]).per(10)
else
@researchs = Research.all.page(params[:page]).per(10)
end
%>
@@ -17,7 +17,11 @@
end
@writing_seminars = WritingSeminar.where(:create_user_id => @user.id).page(params[:page]).per(10)
if @user
@writing_seminars = WritingSeminar.where(:create_user_id => @user.id).page(params[:page]).per(10)
else
@writing_seminars = WritingSeminar.all.page(params[:page]).per(10)
end
%>