修改竞赛通知中评论的相关文件

app/controllers/notificationcomments_controller.rb

@@ -6,7 +6,7 @@ class NotificationcommentsController < ApplicationController
   before_filter :authorize
 
   def create
-    raise Unauthorized unless @contestnotifications.commentable?
+    raise Unauthorized unless @contestnotifications.notificationcommentable?
 
     @notificaioncomment = Notificaioncomment.new
     @notificaioncomment.safe_attributes = params[:notificaioncomment]

app/models/contestnotification.rb

@@ -36,8 +36,8 @@ class Contestnotification < ActiveRecord::Base
   end
 
   # Returns true if the news can be commented by user
-  def commentable?(user=User.current)
+  def notificationcommentable?(user=User.current)
-    user.allowed_to?(:comment_contestnotifications, contest)
+    user.allowed_to?(:notificationcomment_contestnotifications, contest)
   end
 
   def recipients

app/views/contestnotifications/_news.html.erb

@@ -20,7 +20,7 @@
       <tr>
         <td align="left"><a class="font_lighter"> <%= contestnotifications.created_at %></a></td>
         <td width="200" align="right" class="a"><%= link_to l(:label_project_newother),contest_contestnotification_path(contestnotifications)%>
-        	<%= "(#{l(:label_x_comments, :count => contestnotifications.comments_count)})" if contestnotifications.comments_count > 0 %>
+        	<%= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if contestnotifications.notificationcomments_count > 0 %>
         </td>
       </tr>
     </table></td>

app/views/contestnotifications/index.html.erb

@@ -48,7 +48,7 @@
                   <tr>
                     <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
                       &nbsp;<%= format_time(contestnotifications.created_at) %></span></td>
-                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(@contest, contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.comments.count)})" if(contestnotifications.comments.count >= 0)%></td>
+                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(@contest, contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments.count)})" if(contestnotifications.notificationcomments.count >= 0)%></td>
                   </tr>
                 </table>
               </td>

app/views/contestnotifications/show.html.erb

@@ -60,7 +60,7 @@
 </div>
 <% end %>
 
-<div id="comments" style="margin-bottom:16px;">
+<div id="notificationcomments" style="margin-bottom:16px;">
 
 	<div style="margin:15px">
 		<span class="font_description"> <%= textilizable(@contestnotifications, :description) %> </span>
@@ -68,13 +68,13 @@
 		<%= link_to_attachments @contestnotifications %>
 		<br/>
 		<!--add comment-->
-		<% if @contestnotifications.commentable? %>
+		<% if @contestnotifications.notificationcommentable? %>
 		<p>
-			<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>
+			<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "comment_comments" %>
 		</p>
-		<%= form_tag({:controller => 'comments', :action => 'create', :id => @contestnotifications}, :id => "add_comment_form", :style => "display:none;") do %>
+		<%= form_tag({:controller => 'notificationcomments', :action => 'create', :id => @contestnotifications}, :id => "add_notificationcomment_form", :style => "display:none;") do %>
 		<div class="box">
-			<%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
+			<%= text_area 'notificationcomment', 'notificationcomments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
 			<%= wikitoolbar_for 'comment_comments' %>
 		</div>
 		<p>
@@ -92,33 +92,33 @@
 		<!--dispaly comments-->
 		<div  class="line_heng"></div>
 	</div>
-	<h3 class="comments"><%= l(:label_comment_plural) %></h3>
+	<h3 class="notificationcomments"><%= l(:label_comment_plural) %></h3>
-	<% comments = @comments.reverse %>
+	<% notificationcomments = @notificationcomments.reverse %>
-	<% comments.each do |comment| %>
+	<% notificationcomments.each do |notificationcomment| %>
-	<% next if comment.new_record? %>
+	<% next if notificationcomment.new_record? %>
 	<table width="660px" border="0" align="center">
 		<tr>
-			<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(comment.author), :class => "avatar")%></td>
+			<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(notificationcomment.author), :class => "avatar")%></td>
 			<td>
 			<table width="580px" border="0">
 				<tr>
-					<td colspan="2" valign="top"><strong><%= link_to_user(comment.author) if comment.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>
 					<td colspan="2" width="580px" >
 					<p class="font_description">
-						<%= textilizable(comment.comments) %>
+						<%= textilizable(notificationcomment.notificationcomments) %>
 					</p></td>
 				</tr>
 				<tr>
-					<td align="left"><span class="font_lighter"> <%= format_time(comment.created_on) %></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 image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @contestnotifications, :comment_id => comment},
+					<td width="200" align="right" class="a"><%= link_to_if_authorized 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>
 				</tr>
 			</table></td>
 		</tr>
 	</table>
-	<% end if @comments.any? %>
+	<% end if @notificationcomments.any? %>
 </div>
 
 <!--end-->

db/schema.rb

@@ -211,7 +211,7 @@ ActiveRecord::Schema.define(:version => 20140605003915) do
     t.string   "summary"
     t.string   "description"
     t.integer  "author_id"
-    t.integer  "notificationcomments_count"
+    t.integer  "comments_count"
     t.datetime "created_at",     :null => false
     t.datetime "updated_at",     :null => false
   end
@@ -671,8 +671,8 @@ ActiveRecord::Schema.define(:version => 20140605003915) do
     t.boolean  "inherit_members", :default => false, :null => false
     t.integer  "project_type"
     t.boolean  "hidden_repo",     :default => false, :null => false
-    t.integer  "attachmenttype",  :default => 1
     t.integer  "user_id"
+    t.integer  "attachmenttype",  :default => 1
   end
 
   add_index "projects", ["lft"], :name => "index_projects_on_lft"
@@ -709,7 +709,7 @@ ActiveRecord::Schema.define(:version => 20140605003915) do
   end
 
   create_table "relative_memos", :force => true do |t|
-    t.integer  "osp_id"
+    t.integer  "osp_id",                                :null => false
     t.integer  "parent_id"
     t.string   "subject",                               :null => false
     t.text     "content",                               :null => false
@@ -800,6 +800,7 @@ ActiveRecord::Schema.define(:version => 20140605003915) do
     t.datetime "updated_at",  :null => false
     t.integer  "project_id"
     t.integer  "user_id"
+    t.string   "description"
   end
 
   create_table "softapplications", :force => true do |t|
@@ -904,8 +905,8 @@ ActiveRecord::Schema.define(:version => 20140605003915) do
     t.integer  "zip_code"
     t.datetime "created_at",         :null => false
     t.datetime "updated_at",         :null => false
-    t.integer  "identity"
     t.string   "technical_title"
+    t.integer  "identity"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"

lib/redmine.rb

@@ -148,9 +148,9 @@ Redmine::AccessControl.map do |map|
   end
 
   map.contest_module :contestnotifications do |map|
-    map.permission :manage_contestnotifications, {:contestnotifications => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
+    map.permission :manage_contestnotifications, {:contestnotifications => [:new, :create, :edit, :update, :destroy], :notificationcomments => [:destroy]}, :require => :member
     map.permission :view_contestnotifications, {:contestnotifications => [:index, :show]}, :public => true, :read => true
-    map.permission :comment_contestnotifications, {:comments => :create}
+    map.permission :notificationcomment_contestnotifications, {:notificationcomments => :create}
   end
 
   map.project_module :documents do |map|