diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ea37766b6..3fea454de 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -403,17 +403,29 @@ class ProjectsController < ApplicationController
#Ended by young
def feedback
- page = params[:page]
+ @page = params[:page]
+ @page = @page.to_i
# Find the page of the requested reply
@jours = @project.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
- @limit = 10
- if params[:r] && page.nil?
- offset = @jours.count(:conditions => ["#{JournalsForMessage.table_name}.id > ?", params[:r].to_i])
- page = 1 + offset / @limit
+ @limit = 3
+
+ offset = @jours.count(:conditions => ["#{JournalsForMessage.table_name}.id > ?", params[:r].to_i])
+ page = 1 + offset / @limit
+ if params[:r] && @page.nil?
+ @page = page
end
-
+
+ puts @page
+ if @page < 0
+ @page = 1
+ end
+ if @page > page
+ @page = page
+ end
+
+
@feedback_count = @jours.count
- @feedback_pages = Paginator.new @feedback_count, @limit, page
+ @feedback_pages = Paginator.new @feedback_count, @limit, @page
@offset ||= @feedback_pages.offset
@jour = @jours[@offset, @limit]
@state = false
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index af850d626..e31bb2738 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -90,8 +90,37 @@ class WordsController < ApplicationController
end
def destroyJournal
+
@journalP=JournalsForMessage.find(params[:object_id])
@journalP.destroy
+
+ @page = params[:page]
+ @page = @page.to_i
+ @project = Project.find params[:project_id]
+ # Find the page of the requested reply
+ @jours = @project.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+ @limit = 3
+
+ offset = @jours.count(:conditions => ["#{JournalsForMessage.table_name}.id > ?", params[:r].to_i])
+ page = 1 + offset / @limit
+ if params[:r] && @page.nil?
+ @page = page
+ end
+
+ if @page < 0
+ @page = 1
+ end
+ if @page > page
+ @page = page
+ end
+
+ @feedback_count = @jours.count
+ @feedback_pages = Paginator.new @feedback_count, @limit, @page
+ @offset ||= @feedback_pages.offset
+ @jour = @jours[@offset, @limit]
+ @state = false
+ @base_courses_tag = @project.project_type
+
respond_to do |format|
format.js
end
diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb
index 13e123b35..8e36b8c59 100644
--- a/app/views/projects/feedback.html.erb
+++ b/app/views/projects/feedback.html.erb
@@ -36,7 +36,8 @@ function checkMaxLength() {
-<% reply_allow = JournalsForMessage.create_by_user? User.current %>
+
+
<%= l(:label_user_response) %>
@@ -59,6 +60,8 @@ function checkMaxLength() {
<% end %>
+
+ <% reply_allow = JournalsForMessage.create_by_user? User.current %>
<% if @jour.size >0 %>
<% for journal in @jour%>
@@ -81,7 +84,7 @@ function checkMaxLength() {
<% if User.current.logged? %>
<% if journal.user_id==User.current.id|| User.current.admin? %>
- <%= link_to(l(:button_delete),{:controller => 'words', :action => 'destroyJournal', :object_id => journal.id},
+ <%= link_to(l(:button_delete),{:controller => 'words', :action => 'destroyJournal', :object_id => journal.id, :project_id=>@project.id, :page=>@page},
:remote => true, :title => l(:button_delete)) %>
<% end %>
<% end %>
@@ -106,4 +109,5 @@ function checkMaxLength() {
<%= pagination_links_full @feedback_pages %>
+
\ No newline at end of file
diff --git a/app/views/words/_feedback.html.erb b/app/views/words/_feedback.html.erb
new file mode 100644
index 000000000..774ee3b64
--- /dev/null
+++ b/app/views/words/_feedback.html.erb
@@ -0,0 +1,50 @@
+<% reply_allow = JournalsForMessage.create_by_user? User.current %>
+<% if @jour.size >0 %>
+
+ <% for journal in @jour%>
+ -
+ <%= image_tag(url_to_avatar(journal.user), :class => "avatar") %>
+
+ <%= link_to journal.user, user_path(journal.user)%>
+ <%= textilizable journal.notes%>
+ <%= l :label_update_time %>: <%= format_time journal.created_on %>
+ <% id = 'project_respond_form_'+journal.id.to_s%>
+
+ <% if reply_allow %>
+ <%= link_to l(:label_projects_feedback_respond),'#',
+ {:focus => 'project_respond',
+ :onclick => "toggleAndSettingWordsVal($('##{id}'),
+ $('##{id} textarea'),
+ '#{l(:label_reply_plural)} #{journal.user.name}: ');
+ return false;"} %>
+ <% end %>
+
+ <% if User.current.logged? %>
+ <% if journal.user_id==User.current.id|| User.current.admin? %>
+ <%= link_to(l(:button_delete),{:controller => 'words', :action => 'destroyJournal', :object_id => journal.id, :project_id=>@project.id, :page=>@page},
+ :remote => true, :title => l(:button_delete)) %>
+ <% end %>
+ <% end %>
+
+
+
+ <% if reply_allow %>
+
+ <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal} %>
+
+ <% end %>
+
+
+ <%= render :partial => "words/journal_reply", :locals => {:journal => journal } %>
+
+
+ <% end %>
+
+<% end %>
+
+
\ No newline at end of file
diff --git a/app/views/words/destroyJournal.js.erb b/app/views/words/destroyJournal.js.erb
index 5c91c6053..3600c3fd6 100644
--- a/app/views/words/destroyJournal.js.erb
+++ b/app/views/words/destroyJournal.js.erb
@@ -1,3 +1,5 @@
+
<% if @journalP!=nil %>
- $(".message-for-user").children("#word_li_<%=@journalP.id%>").remove();
+ //$(".message-for-user").children("#word_li_<%#=@journalP.id%>").remove();
+ $("#project_feedback").html("<%= escape_javascript(render :partial => 'words/feedback') %>");
<% end %>
\ No newline at end of file