From 9a62fe22c62f21b251673d194eac70ea4aec2e8e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 20 May 2014 08:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=9C=E4=B8=9A=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=E6=A8=A1=E5=9D=97=E5=85=88=E5=9B=9E=E5=A4=8D=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=E7=84=B6=E5=90=8E=E5=88=A0=E9=99=A4=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E7=95=99=E8=A8=80=E7=95=8C=E9=9D=A2=E4=B8=8D=E4=BC=9A=E5=8F=8A?=
 =?UTF-8?q?=E6=97=B6=E5=88=B7=E6=96=B0=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_attach_controller.rb | 24 +++++++++----------
 app/views/homework_attach/addjours.js.erb     |  2 +-
 app/views/homework_attach/destroy.js.erb      | 12 ++++------
 config/routes.rb                              |  6 ++---
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index 8dc5d80a0..2a0f97613 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -26,13 +26,13 @@ class HomeworkAttachController < ApplicationController
   #删除留言
   def destroy
     @journal_destroyed = JournalsForMessage.delete_message(params[:object_id])
-    @homework = HomeworkAttach.find(params[:id])
-    @jours = @homework.journals_for_messages.order("created_on DESC")
-    @limit =  10
-    @feedback_count = @jours.count
-    @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
-    @offset ||= @feedback_pages.offset
-    @jour = @jours[@offset, @limit]
+    #@homework = HomeworkAttach.find(params[:id])
+    #@jours = @homework.journals_for_messages.order("created_on DESC")
+    #@limit =  10
+    #@feedback_count = @jours.count
+    #@feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+    #@offset ||= @feedback_pages.offset
+    #@jour = @jours[@offset, @limit]
     respond_to do |format|
       format.js
     end
@@ -43,11 +43,11 @@ class HomeworkAttachController < ApplicationController
     @homework = HomeworkAttach.find(params[:jour_id])
     @homework.addjours User.current.id, params[:new_form][:user_message],0
     @jours = @homework.journals_for_messages.order("created_on DESC")
-    @limit =  10
-    @feedback_count = @jours.count
-    @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
-    @offset ||= @feedback_pages.offset
-    @jour = @jours[@offset, @limit]
+    #@limit =  10
+    #@feedback_count = @jours.count
+    #@feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+    #@offset ||= @feedback_pages.offset
+    #@jour = @jours[@offset, @limit]
     respond_to do |format|
       format.js
     end
diff --git a/app/views/homework_attach/addjours.js.erb b/app/views/homework_attach/addjours.js.erb
index e463237e5..e0f32581e 100644
--- a/app/views/homework_attach/addjours.js.erb
+++ b/app/views/homework_attach/addjours.js.erb
@@ -1,4 +1,4 @@
-$('#message').html('<%= escape_javascript(render(:partial => 'showjour', :locals => {:jour =>@jour, :state => false} )) %>');
+$('#message').html('<%= escape_javascript(render(:partial => 'showjour', :locals => {:jour =>@jours, :state => false} )) %>');
 $('#pre_show').html('<%= escape_javascript(render(:partial => 'pre_show', :locals => {:content => nil})) %>');
 $('#new_form_user_message').val("");
 $('#new_form_reference_user_id').val("");
\ No newline at end of file
diff --git a/app/views/homework_attach/destroy.js.erb b/app/views/homework_attach/destroy.js.erb
index 9691a6aee..22f7fc048 100644
--- a/app/views/homework_attach/destroy.js.erb
+++ b/app/views/homework_attach/destroy.js.erb
@@ -1,12 +1,8 @@
 <% if @journal_destroyed.nil? %>
 	alert('<%=l(:notice_failed_delete)%>');
-<% elsif (['Principal','Project', 'Bid', 'Contest', 'Softapplication','HomeworkAttach'].include? @journal_destroyed.jour_type)%>
-	var destroyedItem = $('#word_li_<%=@journal_destroyed.id%>')
-	destroyedItem.fadeOut(600,function(){
-		destroyedItem.remove();
-	});
 <% else %>
-
-	$('#message').html('<%= escape_javascript(render(:partial => 'showjour', :locals => {:jour => @jours, :state => false})) %>');
-	$('#new_form_reference_user_id').val("");
+    var destroyedItem = $('#word_li_<%=@journal_destroyed.id%>')
+    destroyedItem.fadeOut(600,function(){
+        destroyedItem.remove();
+    });
 <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index be132dd68..f6717583b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,9 +16,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 RedmineApp::Application.routes.draw do
-  resources :homework_users
-
-
+  resources :homework_users
+
+
   resources :no_uses
   delete 'no_uses', :to => 'no_uses#delete'