From 9cb026ed39289051c548d142c522394e568956dc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 4 Aug 2014 15:01:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AB=9E=E8=B5=9B=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=AF=84=E8=AE=BA=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notificationcomments_controller.rb           | 13 +++++++++++--
 app/models/notificationcomment.rb                |  1 +
 app/views/contestnotifications/show.html.erb     | 16 +++++++++++++++-
 config/routes.rb                                 |  8 +++++++-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/app/controllers/notificationcomments_controller.rb b/app/controllers/notificationcomments_controller.rb
index 80500ab10..43cad6cbb 100644
--- a/app/controllers/notificationcomments_controller.rb
+++ b/app/controllers/notificationcomments_controller.rb
@@ -1,4 +1,7 @@
 class NotificationcommentsController < ApplicationController
+  def show
+
+  end
   # default_search_scope :contestnotifications
   # model_object Contestnotifications
   # before_filter :authorize
@@ -20,8 +23,14 @@ class NotificationcommentsController < ApplicationController
   end
 
   def destroy
-    @contestnotifications.notificaioncomments.find(params[:notificaioncomment_id]).destroy
-    redirect_to contest_contestnotification_path(@contestnotifications)
+    @contest = Contest.find(params[:contest_id])
+    @contestnotification = Contestnotification.find(params[:contestnotification_id])
+    notificaioncomments = Notificationcomment.find(params[:id])
+    notificaioncomments.destroy if notificaioncomments
+    #@contestnotifications = notificaioncomments.Contestnotification
+    #@contest = @contestnotifications.contest
+    #@contestnotifications.notificaioncomments.find(params[:notificaioncomment_id]).destroy
+    redirect_to contest_contestnotification_path(@contest,@contestnotification)
   end
   
 end
diff --git a/app/models/notificationcomment.rb b/app/models/notificationcomment.rb
index 9cc658f22..ce4227a00 100644
--- a/app/models/notificationcomment.rb
+++ b/app/models/notificationcomment.rb
@@ -4,6 +4,7 @@ class Notificationcomment < ActiveRecord::Base
   include Redmine::SafeAttributes
   belongs_to :notificationcommented, :polymorphic => true#, :counter_cache => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+  belongs_to :Contestnotification
 
   validates_presence_of :notificationcommented, :author, :notificationcomments
 
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index eea4cc204..b6ac88008 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -69,7 +69,21 @@
 			<td>
 			<table width="580px" border="0">
 				<tr>
-					<td colspan="2" valign="top"><strong><%= link_to_user(notificationcomment.author) if notificationcomment.respond_to?(:author) %> </strong><span class="font_lighter"><%= l(:label_project_newadd) %></span><%= l(:label_comment_plural) %></td>
+					<td colspan="2" valign="top">
+                      <strong>
+                        <%= link_to_user(notificationcomment.author) if notificationcomment.respond_to?(:author) %>
+                      </strong>
+                      <span class="font_lighter">
+                        <%= l(:label_project_newadd) %>
+                      </span>
+                        <%= l(:label_comment_plural) %>
+                    </td>
+                    <td>
+                      <% if notificationcomment.author==User.current|| User.current.admin? %>
+                          <%= link_to(l(:label_bid_respond_delete),  contest_contestnotification_notificationcomment_path(@contest, @contestnotification,notificationcomment),
+                                       :method => :delete,:confirm => l(:text_are_you_sure),  :title => l(:button_delete))  %>
+                      <% end %>
+                    </td>
 				</tr>
 				<tr>
 					<td colspan="2" width="580px" >
diff --git a/config/routes.rb b/config/routes.rb
index af70b76da..1e75ac23a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -83,6 +83,10 @@ RedmineApp::Application.routes.draw do
     end
   end
 
+  #resources :notificationcomments do
+  #
+  #end
+
   #resources :contestnotifications, :only => [:index, :show, :edit, :update, :destroy]
   # match '/contestnotifications/:id/notificationcomments', :to => 'notificationcomments#create', :via => :post
   # match '/contestnotifications/:id/notificationcomments/:notificationcomment_id', :to => 'notificationcomments#destroy', :via => :delete
@@ -91,7 +95,9 @@ RedmineApp::Application.routes.draw do
   resources :contests, only: [:index] do
     resources :contestnotifications do
       # get 'preview', on: :collection
-      resources :notificationcomments
+      resources :notificationcomments do
+
+      end
     end
 
     collection do