This commit is contained in:
parent
545e5c5941
commit
45e12c4bef
|
|
@ -1,35 +1,27 @@
|
||||||
class NotificationcommentsController < ApplicationController
|
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
|
def create
|
||||||
#raise Unauthorized unless @contestnotifications.notificationcommentable?
|
#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)
|
flash[:notice] = l(:label_comment_added)
|
||||||
end
|
end
|
||||||
|
|
||||||
redirect_to contest_contestnotification_path(@contestnotifications)
|
#redirect_to contest_contestnotification_notificationcomment_path(@contest, @contestnotification, @notificaioncomment)
|
||||||
|
redirect_to contest_contestnotification_path(@contest, @contestnotification)
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@contestnotifications.notificationcomments.find(params[:notificationcomment_id]).destroy
|
@contestnotifications.notificaioncomments.find(params[:notificaioncomment_id]).destroy
|
||||||
redirect_to contest_contestnotification_path(@contestnotifications)
|
redirect_to contest_contestnotification_path(@contestnotifications)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def find_model_object
|
|
||||||
super
|
|
||||||
@contestnotifications = @object
|
|
||||||
@notificationcomment = nil
|
|
||||||
@contestnotifications
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,63 +1,63 @@
|
||||||
class Contestnotification < ActiveRecord::Base
|
class Contestnotification < ActiveRecord::Base
|
||||||
#attr_accessible :author_id, :notificationcomments_count, :contest_id, :description, :summary, :title
|
#attr_accessible :author_id, :notificationcomments_count, :contest_id, :description, :summary, :title
|
||||||
|
|
||||||
include Redmine::SafeAttributes
|
include Redmine::SafeAttributes
|
||||||
#Contestnotification::Notificationcomment
|
#Contestnotification::Notificationcomment
|
||||||
belongs_to :contest
|
belongs_to :contest
|
||||||
belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
|
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
|
# fq
|
||||||
has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
|
has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
|
||||||
|
|
||||||
validates_presence_of :title, :description
|
validates_presence_of :title, :description
|
||||||
validates_length_of :title, :maximum => 60
|
validates_length_of :title, :maximum => 60
|
||||||
validates_length_of :summary, :maximum => 255
|
validates_length_of :summary, :maximum => 255
|
||||||
|
|
||||||
acts_as_attachable :delete_permission => :manage_contestnotifications
|
acts_as_attachable :delete_permission => :manage_contestnotifications
|
||||||
acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :contest
|
acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :contest
|
||||||
acts_as_event :url => Proc.new {|o| {:controller => 'contestnotifications', :action => 'show', :id => o.id}}
|
acts_as_event :url => Proc.new {|o| {:controller => 'contestnotifications', :action => 'show', :id => o.id}}
|
||||||
acts_as_activity_provider :find_options => {:include => [:contest, :author]},
|
acts_as_activity_provider :find_options => {:include => [:contest, :author]},
|
||||||
:author_key => :author_id
|
:author_key => :author_id
|
||||||
acts_as_watchable
|
acts_as_watchable
|
||||||
|
|
||||||
after_create :add_author_as_watcher
|
after_create :add_author_as_watcher
|
||||||
|
|
||||||
after_create :act_as_activity
|
after_create :act_as_activity
|
||||||
|
|
||||||
|
|
||||||
scope :visible, lambda {|*args|
|
scope :visible, lambda {|*args|
|
||||||
nil
|
nil
|
||||||
#includes(:contest).where(Contest.allowed_to_condition(args.shift || User.current, :view_contestnotifications, *args))
|
#includes(:contest).where(Contest.allowed_to_condition(args.shift || User.current, :view_contestnotifications, *args))
|
||||||
}
|
}
|
||||||
|
|
||||||
safe_attributes 'title', 'summary', 'description'
|
safe_attributes 'title', 'summary', 'description'
|
||||||
|
|
||||||
def visible?(user=User.current)
|
def visible?(user=User.current)
|
||||||
!user.nil? && user.allowed_to?(:view_contestnotifications, contest)
|
!user.nil? && user.allowed_to?(:view_contestnotifications, contest)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns true if the news can be commented by user
|
# Returns true if the news can be commented by user
|
||||||
def notificationcommentable?(user=User.current)
|
def notificationcommentable?(user=User.current)
|
||||||
user.allowed_to?(:notificationcomment_contestnotifications, contest)
|
user.allowed_to?(:notificationcomment_contestnotifications, contest)
|
||||||
end
|
end
|
||||||
|
|
||||||
def recipients
|
def recipients
|
||||||
#contest.users.select {|user| user.notify_about?(self)}.map(&:mail)
|
#contest.users.select {|user| user.notify_about?(self)}.map(&:mail)
|
||||||
end
|
end
|
||||||
|
|
||||||
# returns latest news for contests visible by user
|
# returns latest news for contests visible by user
|
||||||
def self.latest(user = User.current, count = 5)
|
def self.latest(user = User.current, count = 5)
|
||||||
visible(user).includes([:author, :contest]).order("#{Contestnotification.table_name}.created_at DESC").limit(count).all
|
visible(user).includes([:author, :contest]).order("#{Contestnotification.table_name}.created_at DESC").limit(count).all
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def add_author_as_watcher
|
def add_author_as_watcher
|
||||||
#Watcher.create(:watchable => self, :user => author)
|
#Watcher.create(:watchable => self, :user => author)
|
||||||
end
|
end
|
||||||
## fq
|
## fq
|
||||||
def act_as_activity
|
def act_as_activity
|
||||||
self.acts << Activity.new(:user_id => self.author_id)
|
self.acts << Activity.new(:user_id => self.author_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,10 @@ class Notificationcomment < ActiveRecord::Base
|
||||||
attr_accessible :author_id, :notificationcommented_id, :notificationcommented_type, :notificationcomments
|
attr_accessible :author_id, :notificationcommented_id, :notificationcommented_type, :notificationcomments
|
||||||
|
|
||||||
include Redmine::SafeAttributes
|
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'
|
belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
|
||||||
|
|
||||||
validates_presence_of :notificationcommented, :author, :notificationcomments
|
validates_presence_of :notificationcommented, :author, :notificationcomments
|
||||||
|
|
||||||
safe_attributes 'notificationcomments'
|
# safe_attributes 'notificationcomments'
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,88 +1,88 @@
|
||||||
|
|
||||||
<div class="contextual">
|
<div class="contextual">
|
||||||
<%= watcher_link(@contestnotification, User.current) %>
|
<%= watcher_link(@contestnotification, User.current) %>
|
||||||
<%= link_to(l(:button_edit),
|
<%= link_to(l(:button_edit),
|
||||||
edit_contest_contestnotification_path(@contestnotification),
|
edit_contest_contestnotification_path(@contestnotification),
|
||||||
:class => 'icon icon-edit',
|
:class => 'icon icon-edit',
|
||||||
:accesskey => accesskey(:edit),
|
:accesskey => accesskey(:edit),
|
||||||
:onclick => '$("#edit-contestnotifications").show(); return false;') if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
|
:onclick => '$("#edit-contestnotifications").show(); return false;') if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
|
||||||
<%= delete_link contest_contestnotification_path(@contestnotification) if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
|
<%= delete_link contest_contestnotification_path(@contestnotification) if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h3><strong><%=h @contestnotification.title %></strong></h3>
|
<h3><strong><%=h @contestnotification.title %></strong></h3>
|
||||||
|
|
||||||
<% if authorize_for_contest('contestnotifications', 'edit') %>
|
<% if authorize_for_contest('contestnotifications', 'edit') %>
|
||||||
<div id="edit-contestnotifications" style="display:none;">
|
<div id="edit-contestnotifications" style="display:none;">
|
||||||
<%= labelled_form_for :contestnotifications, @contestnotification, :url => contest_contestnotification_path(@contestnotification),
|
<%= labelled_form_for :contestnotifications, @contestnotification, :url => contest_contestnotification_path(@contestnotification),
|
||||||
:html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
|
:html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
|
||||||
<%= render :partial => 'form', :locals => { :f => f } %>
|
<%= render :partial => 'form', :locals => { :f => f } %>
|
||||||
<%= submit_tag l(:button_save) %>
|
<%= submit_tag l(:button_save) %>
|
||||||
<%= preview_link preview_contestnotifications_path(:contest_id => @contest, :id => @contestnotification), 'contestnotifications-form',target='preview',{:class => ''} %> |
|
<%= preview_link preview_contestnotifications_path(:contest_id => @contest, :id => @contestnotification), 'contestnotifications-form',target='preview',{:class => ''} %> |
|
||||||
<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-contestnotifications").hide(); return false;' %>
|
<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-contestnotifications").hide(); return false;' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<div id="preview" class="wiki"></div>
|
<div id="preview" class="wiki"></div>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<div id="notificationcomments" style="margin-bottom:16px;">
|
<div id="notificationcomments" style="margin-bottom:16px;">
|
||||||
|
|
||||||
<div style="margin:15px">
|
<div style="margin:15px">
|
||||||
<span class="font_description"> <%= textilizable(@contestnotification, :description) %> </span>
|
<span class="font_description"> <%= textilizable(@contestnotification, :description) %> </span>
|
||||||
<br/>
|
<br/>
|
||||||
<%#= link_to_attachments @contestnotification %>
|
<%#= link_to_attachments @contestnotification %>
|
||||||
<br/>
|
<br/>
|
||||||
<!--add comment-->
|
<!--add comment-->
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "notificationcomment_notificationcomments" %>
|
<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "notificationcomment_notificationcomments" %>
|
||||||
</p>
|
</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">
|
<div class="box">
|
||||||
<%= text_area 'notificationcomment', 'notificationcomments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
|
<%= text_area 'notificationcomment', 'notificationcomments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
|
||||||
<%= wikitoolbar_for 'notificationcomment_notificationcomments' %>
|
<%= wikitoolbar_for 'notificationcomment_notificationcomments' %>
|
||||||
</div>
|
</div>
|
||||||
<p>
|
<p>
|
||||||
<%= submit_tag l(:button_add) %>
|
<%= submit_tag l(:button_add) %>
|
||||||
</p>
|
</p>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
|
||||||
<% html_title @contestnotification.title -%>
|
<% html_title @contestnotification.title -%>
|
||||||
|
|
||||||
<% content_for :header_tags do %>
|
<% content_for :header_tags do %>
|
||||||
<%= stylesheet_link_tag 'scm' %>
|
<%= stylesheet_link_tag 'scm' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<!--dispaly comments-->
|
<!--dispaly comments-->
|
||||||
<div class="line_heng"></div>
|
<div class="line_heng"></div>
|
||||||
</div>
|
</div>
|
||||||
<h3 class="notificationcomments"><%= l(:label_comment_plural) %></h3>
|
<h3 class="notificationcomments"><%= l(:label_comment_plural) %></h3>
|
||||||
<% notificationcomments = @notificationcomments.reverse %>
|
<% notificationcomments = @notificationcomments.reverse %>
|
||||||
<% notificationcomments.each do |notificationcomment| %>
|
<% notificationcomments.each do |notificationcomment| %>
|
||||||
<% next if notificationcomment.new_record? %>
|
<% next if notificationcomment.new_record? %>
|
||||||
<table width="660px" border="0" align="center">
|
<table width="660px" border="0" align="center">
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(notificationcomment.author), :class => "avatar")%></td>
|
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(notificationcomment.author), :class => "avatar")%></td>
|
||||||
<td>
|
<td>
|
||||||
<table width="580px" border="0">
|
<table width="580px" border="0">
|
||||||
<tr>
|
<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>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2" width="580px" >
|
<td colspan="2" width="580px" >
|
||||||
<p class="font_description">
|
<p class="font_description">
|
||||||
<%= textilizable(notificationcomment.notificationcomments) %>
|
<%= textilizable(notificationcomment.notificationcomments) %>
|
||||||
</p></td>
|
</p></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td align="left"><span class="font_lighter"> <%= format_time(notificationcomment.created_at) %></span></td>
|
<td align="left"><span class="font_lighter"> <%= format_time(notificationcomment.created_at) %></span></td>
|
||||||
<td width="200" align="right" class="a"><%= link_to_if_authorized_contest image_tag('delete.png'), {:controller => 'notificationcomments', :action => 'destroy', :id => @contestnotifications, :notificationcomment_id => notificationcomment},
|
<td width="200" align="right" class="a"><%= link_to_if_authorized_contest image_tag('delete.png'), {:controller => 'notificationcomments', :action => 'destroy', :id => @contestnotifications, :notificationcomment_id => notificationcomment},
|
||||||
:data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %></td>
|
:data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table></td>
|
</table></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<% end if @notificationcomments.any? %>
|
<% end if @notificationcomments.any? %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!--end-->
|
<!--end-->
|
||||||
|
|
|
||||||
|
|
@ -71,12 +71,15 @@ RedmineApp::Application.routes.draw do
|
||||||
end
|
end
|
||||||
|
|
||||||
#resources :contestnotifications, :only => [:index, :show, :edit, :update, :destroy]
|
#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 #新竞赛相关
|
## new added by linchun #新竞赛相关
|
||||||
resources :contests, only: [:index] do
|
resources :contests, only: [:index] do
|
||||||
resources :contestnotifications
|
resources :contestnotifications do
|
||||||
|
resources :notificationcomments
|
||||||
|
end
|
||||||
|
|
||||||
collection do
|
collection do
|
||||||
match 'new_contest' , via: :get
|
match 'new_contest' , via: :get
|
||||||
match 'join_in_contest' , via: :post
|
match 'join_in_contest' , via: :post
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue