diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 8a5bfd9fb..a048c3c9c 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -672,10 +672,10 @@ class CoursesController < ApplicationController
page = 1 + offset / @limit
end
- @feedback_count = @jours.count
- @feedback_pages = Paginator.new @feedback_count, @limit, page
- @offset ||= @feedback_pages.offset
- @jour = @jours[@offset, @limit]
+ #@feedback_count = @jours.count
+ #@feedback_pages = Paginator.new @feedback_count, @limit, page
+ #@offset ||= @feedback_pages.offset
+ @jour = paginateHelper @jours,10
@state = false
respond_to do |format|
format.html{render :layout => 'base_courses'}
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index bf0717aae..47c8107ce 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -424,10 +424,10 @@ class ProjectsController < ApplicationController
end
- @feedback_count = @jours.count
- @feedback_pages = Paginator.new @feedback_count, @limit, @page
- @offset ||= @feedback_pages.offset
- @jour = @jours[@offset, @limit]
+ #@feedback_count = @jours.count
+ #@feedback_pages = Paginator.new @feedback_count, @limit, @page
+ #@offset ||= @feedback_pages.offset
+ @jour = paginateHelper @jours,10
@state = false
@base_courses_tag = @project.project_type
diff --git a/app/views/contests/_contest_jours.html.erb b/app/views/contests/_contest_jours.html.erb
index 94814c492..54a7f14a7 100644
--- a/app/views/contests/_contest_jours.html.erb
+++ b/app/views/contests/_contest_jours.html.erb
@@ -1,3 +1,4 @@
+
留言内容
<%= render :partial => 'new', :locals => {:contest => @contest, :sta => @state} %>
@@ -9,4 +10,5 @@
<%= render :partial => 'history',:locals => { :contest => @contest, :journals => @jour, :state => false} %>
-
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true%>
\ No newline at end of file
+
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+
\ No newline at end of file
diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index 70f956d4e..57bde9e68 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -1,3 +1,4 @@
+
<% reply_allow = JournalsForMessage.create_by_user? User.current %>
@@ -26,4 +27,5 @@
<%= render :partial => 'history',:locals => { :contest => @contest, :journals => @jour, :state => false} %>
-
+
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+
\ No newline at end of file
diff --git a/app/views/courses/feedback.html.erb b/app/views/courses/feedback.html.erb
index 90fb9e0c2..ccd171679 100644
--- a/app/views/courses/feedback.html.erb
+++ b/app/views/courses/feedback.html.erb
@@ -43,10 +43,4 @@ function checkMaxLength() {
}
-
-
<% html_title(l(:label_course_feedback)) -%>
\ No newline at end of file
diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb
index 6d6ae1362..2462d57ef 100644
--- a/app/views/projects/_project_jours.html.erb
+++ b/app/views/projects/_project_jours.html.erb
@@ -1,3 +1,4 @@
+
<% reply_allow = JournalsForMessage.create_by_user? User.current %>
@@ -26,4 +27,5 @@
<%= render :partial => 'history',:locals => { :contest => @contest, :journals => @jour, :state => false} %>
-
+
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+