xx

app/controllers/notificationcomments_controller.rb

@@ -1,35 +1,27 @@
 class NotificationcommentsController < ApplicationController
-  default_search_scope :contestnotifications
+  # default_search_scope :contestnotifications
-  model_object Contestnotifications
+  # model_object Contestnotifications
-  before_filter :find_model_object 
+  # before_filter :authorize
-  before_filter :find_contest_from_association
-  before_filter :authorize
 
   def create
     #raise Unauthorized unless @contestnotifications.notificationcommentable?
+    @contest = Contest.find(params[:contest_id])
+    @contestnotification = Contestnotification.find(params[:contestnotification_id])
 
-    @notificationcomment = Notificationcomment.new
+    @notificaioncomment = Notificationcomment.new
-    @notificationcomment.safe_attributes = params[:notificationcomment]
+    @notificaioncomment.safe_attributes = params[:notificaioncomment]
-    @notificationcomment.author = User.current
+    @notificaioncomment.author = User.current
-    if @contestnotifications.notificationcomments << @notificationcomment
+    if @contestnotification.notificationcomments << @notificaioncomment
       flash[:notice] = l(:label_comment_added)
     end
 
-    redirect_to contest_contestnotification_path(@contestnotifications)
+    #redirect_to contest_contestnotification_notificationcomment_path(@contest, @contestnotification, @notificaioncomment)
+    redirect_to contest_contestnotification_path(@contest, @contestnotification)
   end
 
   def destroy
-    @contestnotifications.notificationcomments.find(params[:notificationcomment_id]).destroy
+    @contestnotifications.notificaioncomments.find(params[:notificaioncomment_id]).destroy
     redirect_to contest_contestnotification_path(@contestnotifications)
   end
   
-  private
-
-  def find_model_object
-    super
-    @contestnotifications = @object
-    @notificationcomment = nil
-    @contestnotifications
-  end
-  
 end

app/models/contestnotification.rb

@@ -5,7 +5,7 @@ class Contestnotification < ActiveRecord::Base
   #Contestnotification::Notificationcomment
   belongs_to :contest
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-  has_many :notificationcomments, :as => :notificationcommented, :dependent => :delete_all, :order => "created_at"
+  has_many :notificationcomments, :dependent => :delete_all, :order => "created_at"
   # fq
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   

app/models/notificationcomment.rb

@@ -2,10 +2,10 @@ class Notificationcomment < ActiveRecord::Base
   attr_accessible :author_id, :notificationcommented_id, :notificationcommented_type, :notificationcomments
 
   include Redmine::SafeAttributes
-  belongs_to :notificationcommented, :polymorphic => true, :counter_cache => true
+  belongs_to :notificationcommented, :polymorphic => true#, :counter_cache => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
 
   validates_presence_of :notificationcommented, :author, :notificationcomments
 
-  safe_attributes 'notificationcomments'
+  # safe_attributes 'notificationcomments'
 end

app/views/contestnotifications/show.html.erb

@@ -36,7 +36,7 @@
 		<p>
 			<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "notificationcomment_notificationcomments" %>
 		</p>
-		<%= form_tag({:controller => 'notificationcomments', :action => 'create', :id => @contestnotification}, :id => "add_notificationcomment_form", :style => "display:none;") do %>
+		<%= form_tag( contest_contestnotification_notificationcomments_path(@contest, @contestnotification) , :id => "add_notificationcomment_form", :style => "display:none;") do %>
 		<div class="box">
 			<%= text_area 'notificationcomment', 'notificationcomments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
 			<%= wikitoolbar_for 'notificationcomment_notificationcomments' %>

config/routes.rb

@@ -71,12 +71,15 @@ RedmineApp::Application.routes.draw do
   end
 
   #resources :contestnotifications, :only => [:index, :show, :edit, :update, :destroy]
-  match '/contestnotifications/:id/notificationcomments', :to => 'notificationcomments#create', :via => :post
+  # match '/contestnotifications/:id/notificationcomments', :to => 'notificationcomments#create', :via => :post
-  match '/contestnotifications/:id/notificationcomments/:notificationcomment_id', :to => 'notificationcomments#destroy', :via => :delete
+  # match '/contestnotifications/:id/notificationcomments/:notificationcomment_id', :to => 'notificationcomments#destroy', :via => :delete
-  match '/contestnotifications/preview', :controller => 'previews', :action => 'contestnotifications', :as => 'preview_contestnotifications', :via => [:get, :post, :put]  
+  # match '/contestnotifications/preview', :controller => 'previews', :action => 'contestnotifications', :as => 'preview_contestnotifications', :via => [:get, :post, :put]  
   ## new added by linchun #新竞赛相关
   resources :contests, only: [:index] do
-    resources :contestnotifications
+    resources :contestnotifications do
+      resources :notificationcomments
+    end
+
     collection do
       match 'new_contest'        , via: :get
       match 'join_in_contest'    , via: :post