jro_apps/redmine Commit - r78:55ed70529aef

0

app/models/comment.rb created 644 +6 0

@@ -0,0 +1,6
	1	class Comment < ActiveRecord::Base
	2	belongs_to :commented, :polymorphic => true, :counter_cache => true
	3	belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
	4
	5	validates_presence_of :commented, :author, :comment
	6	end

0

db/migrate/010_create_comments.rb created 644 +16 0

@@ -0,0 +1,16
	1	class CreateComments < ActiveRecord::Migration
	2	def self.up
	3	create_table :comments do \|t\|
	4	t.column :commented_type, :string, :limit => 30, :default => "", :null => false
	5	t.column :commented_id, :integer, :default => 0, :null => false
	6	t.column :author_id, :integer, :default => 0, :null => false
	7	t.column :comment, :text, :default => "", :null => false
	8	t.column :created_on, :datetime, :null => false
	9	t.column :updated_on, :datetime, :null => false
	10	end
	11	end
	12
	13	def self.down
	14	drop_table :comments
	15	end
	16	end

0

db/migrate/011_add_news_comments_count.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddNewsCommentsCount < ActiveRecord::Migration
	2	def self.up
	3	add_column :news, :comments_count, :integer, :default => 0, :null => false
	4	end
	5
	6	def self.down
	7	remove_column :news, :comments_count
	8	end
	9	end

0

db/migrate/012_add_comments_permissions.rb created 644 +11 0

@@ -0,0 +1,11
	1	class AddCommentsPermissions < ActiveRecord::Migration
	2	def self.up
	3	Permission.create :controller => "news", :action => "add_comment", :description => "label_comment_add", :sort => 1130, :is_public => false, :mail_option => 0, :mail_enabled => 0
	4	Permission.create :controller => "news", :action => "destroy_comment", :description => "label_comment_delete", :sort => 1133, :is_public => false, :mail_option => 0, :mail_enabled => 0
	5	end
	6
	7	def self.down
	8	Permission.find(:first, :conditions => ["controller=? and action=?", 'news', 'add_comment']).destroy
	9	Permission.find(:first, :conditions => ["controller=? and action=?", 'news', 'destroy_comment']).destroy
	10	end
	11	end

0

test/fixtures/comments.yml created 644 +10 0

@@ -0,0 +1,10
	1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
	2	comments_001:
	3	commented_type: News
	4	commented_id: 1
	5	id: 1
	6	author_id: 1
	7	comment: my first comment
	8	created_on: 2006-12-10 18:10:10 +01:00
	9	updated_on: 2006-12-10 18:10:10 +01:00
	10	No newline at end of file

0

test/unit/comment_test.rb created 644 +30 0

@@ -0,0 +1,30
	1	require File.dirname(__FILE__) + '/../test_helper'
	2
	3	class CommentTest < Test::Unit::TestCase
	4	fixtures :users, :news, :comments
	5
	6	def setup
	7	@jsmith = User.find(2)
	8	@news = News.find(1)
	9	end
	10
	11	def test_create
	12	comment = Comment.new(:commented => @news, :author => @jsmith, :comment => "my comment")
	13	assert comment.save
	14	@news.reload
	15	assert_equal 2, @news.comments_count
	16	end
	17
	18	def test_validate
	19	comment = Comment.new(:commented => @news)
	20	assert !comment.save
	21	assert_equal 2, comment.errors.length
	22	end
	23
	24	def test_destroy
	25	comment = Comment.find(1)
	26	assert comment.destroy
	27	@news.reload
	28	assert_equal 0, @news.comments_count
	29	end
	30	end

0

app/controllers/news_controller.rb +16 0

@@ -27,7 +27,23 class NewsController < ApplicationController
27	flash[:notice] = l(:notice_successful_update)	27	flash[:notice] = l(:notice_successful_update)
28	redirect_to :action => 'show', :id => @news	28	redirect_to :action => 'show', :id => @news
29	end	29	end
		30	end
		31
		32	def add_comment
		33	@comment = Comment.new(params[:comment])
		34	@comment.author = logged_in_user
		35	if @news.comments << @comment
		36	flash[:notice] = l(:label_comment_added)
		37	redirect_to :action => 'show', :id => @news
		38	else
		39	render :action => 'show'
		40	end
30	end	41	end
		42
		43	def destroy_comment
		44	@news.comments.find(params[:comment_id]).destroy
		45	redirect_to :action => 'show', :id => @news
		46	end
31		47
32	def destroy	48	def destroy
33	@news.destroy	49	@news.destroy

0

app/models/news.rb +1 0

             class News < ActiveRecord::Base
               belongs_to :project
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+              has_many :comments, :as => :commented, :dependent => true, :order => "created_on"
               validates_presence_of :title, :description

0

app/views/news/show.rhtml +23 -1

@@ -13,4 +13,26
13	<% end %>	13	<% end %>
14	</div>	14	</div>
15		15
16	<%= link_to_if_authorized l(:button_edit), :controller => 'news', :action => 'edit', :id => @news %>	16	<p><%= link_to_if_authorized l(:button_edit), :controller => 'news', :action => 'edit', :id => @news %></p>
		17
		18	<div id="comments" style="margin-bottom:16px;">
		19	<h3><%= l(:label_comment_plural) %></h3>
		20	<% @news.comments.each do \|comment\| %>
		21	<% next if comment.new_record? %>
		22	<h4><%= format_time(comment.created_on) %> - <%= comment.author.name %></h4>
		23	<div style="float:right;">
		24	<small><%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :post => true %></small>
		25	</div>
		26	<%= simple_format(auto_link(h comment.comment))%>
		27	<% end if @news.comments_count > 0 %>
		28	</div>
		29
		30	<% if authorize_for 'news', 'add_comment' %>
		31	<h3><%= l(:label_comment_add) %></h3>
		32	<%= start_form_tag :action => 'add_comment', :id => @news %>
		33	<%= error_messages_for 'comment' %>
		34	<p><label for="comment_comment"><%= l(:field_comment) %></label><br />
		35	<%= text_area 'comment', 'comment', :cols => 60, :rows => 6 %></p>
		36	<%= submit_tag l(:button_add) %>
		37	<%= end_form_tag %>
		38	<% end %> No newline at end of file

0

app/views/projects/list_news.rhtml +2 -1

             <% for news in @news %>
             	<li><%= link_to news.title, :controller => 'news', :action => 'show', :id => news %><br />
             	<% unless news.summary.empty? %><%= news.summary %><br /><% end %>
-            	<em><%= news.author.name %>, <%= format_time(news.created_on) %></em><br />&nbsp;
+            	<em><%= news.author.name %>, <%= format_time(news.created_on) %></em><br />
+            	<%= news.comments_count %> <%= lwr(:label_comment, news.comments_count).downcase %><br />&nbsp;
             	</li>
             <% end %>
             </ul>

0

lang/de.yml +6 0

             field_start_date: Beginn
             field_done_ratio: %% Getan
             field_hide_mail: Mein email address verstecken
+            field_comment: Anmerkung
             label_user: Benutzer
             label_user_plural: Benutzer
             label_last_changes: %d änderungen des Letzten
             label_change_view_all: Alle änderungen ansehen
             label_personalize_page: Diese Seite personifizieren
+            label_comment: Anmerkung
+            label_comment_plural: Anmerkungen
+            label_comment_add: Anmerkung addieren
+            label_comment_added: Anmerkung fügte hinzu
+            label_comment_delete: Anmerkungen löschen
             button_login: Einloggen
             button_submit: Einreichen

0

lang/en.yml +6 0

             field_start_date: Start
             field_done_ratio: %% Done
             field_hide_mail: Hide my email address
+            field_comment: Comment
             label_user: User
             label_user_plural: Users
             label_last_changes: last %d changes
             label_change_view_all: View all changes
             label_personalize_page: Personalize this page
+            label_comment: Comment
+            label_comment_plural: Comments
+            label_comment_add: Add a comment
+            label_comment_added: Comment added
+            label_comment_delete: Delete comments
             button_login: Login
             button_submit: Submit

0

lang/es.yml +6 0

             field_start_date: Comienzo
             field_done_ratio: %% Realizado
             field_hide_mail: Ocultar mi email address
+            field_comment: Comentario
             label_user: Usuario
             label_user_plural: Usuarios
             label_last_changes: %d cambios del último
             label_change_view_all: Ver todos los cambios
             label_personalize_page: Personalizar esta página
+            label_comment: Comentario
+            label_comment_plural: Comentarios
+            label_comment_add: Agregar un comentario
+            label_comment_added: Comentario agregó
+            label_comment_delete: Suprimir comentarios
             button_login: Conexión
             button_submit: Someter

0

lang/fr.yml +6 0

             field_done_ratio: %% Réalisé
             field_auth_source: Mode d'authentification
             field_hide_mail: Cacher mon adresse mail
+            field_comment: Commentaire
             label_user: Utilisateur
             label_user_plural: Utilisateurs
             label_last_changes: %d derniers changements
             label_change_view_all: Voir tous les changements
             label_personalize_page: Personnaliser cette page
+            label_comment: Commentaire
+            label_comment_plural: Commentaires
+            label_comment_add: Ajouter un commentaire
+            label_comment_added: Commentaire ajouté
+            label_comment_delete: Supprimer les commentaires
             button_login: Connexion
             button_submit: Soumettre

0

lib/tasks/load_default_data.rake +2 -2

               manager.permissions = Permission.find(:all, :conditions => ["is_public=?", false])
               developper = Role.create :name => l(:default_role_developper)
-              perms = [150, 320, 321, 322, 420, 421, 422, 1050, 1060, 1070, 1075, 1220, 1221, 1222, 1223, 1224, 1320, 1322, 1061, 1057]
+              perms = [150, 320, 321, 322, 420, 421, 422, 1050, 1060, 1070, 1075, 1130, 1220, 1221, 1222, 1223, 1224, 1320, 1322, 1061, 1057]
               developper.permissions = Permission.find(:all, :conditions => ["sort IN (#{perms.join(',')})"])
               reporter = Role.create :name => l(:default_role_reporter)
-              perms = [1050, 1060, 1070, 1057]
+              perms = [1050, 1060, 1070, 1057, 1130]
               reporter.permissions = Permission.find(:all, :conditions => ["sort IN (#{perms.join(',')})"])
               # trackers

0

public/stylesheets/application.css +1 -1

                 margin-left: 4px;
             }
-            #history h4 {
+            #history h4, #comments h4 {
                 font-size: 1em;
                 margin-bottom: 12px;
                 margin-top: 20px;

0

test/fixtures/news.yml +2 0

                 Visit http://ecookbook.somenet.foo/
               summary: First version was released...
               author_id: 2
+              comments_count: 1
             news_002:
               created_on: 2006-07-19 22:42:58 +02:00
               project_id: 1
               description: eCookbook 1.0 have downloaded 100,000 times
               summary: eCookbook 1.0 have downloaded 100,000 times
               author_id: 2
+              comments_count: 0

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages