+ <%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %> + <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %> + | <%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %> + <% end %> + <% if User.current.allowed_to?(:view_gantt, @project, :global => true) %> + | <%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %> + <% end %> +
+<%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %>
+<%= l_hours(@total_hours) %>
+<%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => @project}) %> | + <%= link_to(l(:label_report), {:controller => 'time_entry_reports', :action => 'report', :project_id => @project}) %>
+ <% end %> + <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %> +<% end %> + +<% content_for :header_tags do %> +<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %> +<% end %> + +<% html_title(l(:label_overview)) -%> diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/03/033178c724d843125ead35eb43e31dacdb4a5511.svn-base --- /dev/null +++ b/.svn/pristine/03/033178c724d843125ead35eb43e31dacdb4a5511.svn-base @@ -0,0 +1,11 @@ +# Patch the data from a boolean change. +class UpdateMailNotificationValues < ActiveRecord::Migration + def self.up + # No-op + # See 20100129193402_change_users_mail_notification_to_string.rb + end + + def self.down + # No-op + end +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/03/03389ce7c25a023f73b895dc03af8c3f1ee755e9.svn-base --- /dev/null +++ b/.svn/pristine/03/03389ce7c25a023f73b895dc03af8c3f1ee755e9.svn-base @@ -0,0 +1,8 @@ +<%= l(:mail_body_account_activation_request, h(@user.login)) %>
+<%= link_to h(@url), @url %>
diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/03/033e041df5add14807dd8e40c1a8ef8894cdf897.svn-base --- /dev/null +++ b/.svn/pristine/03/033e041df5add14807dd8e40c1a8ef8894cdf897.svn-base @@ -0,0 +1,18 @@ +Return-Path:+<%= l(:label_my_projects) %> +
+<% end %> + +<% other_formats_links do |f| %> + <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %> +<% end %> + +<% html_title(l(:label_project_plural)) -%> diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/04/04bd6b422ff086dcb557f90d7ba79b9553b3ae87.svn-base --- /dev/null +++ b/.svn/pristine/04/04bd6b422ff086dcb557f90d7ba79b9553b3ae87.svn-base @@ -0,0 +1,71 @@ +# encoding: utf-8 +module CodeRay +module Scanners + + class Ruby + + class StringState < Struct.new :type, :interpreted, :delim, :heredoc, + :opening_paren, :paren_depth, :pattern, :next_state # :nodoc: all + + CLOSING_PAREN = Hash[ *%w[ + ( ) + [ ] + < > + { } + ] ].each { |k,v| k.freeze; v.freeze } # debug, if I try to change it with << + + STRING_PATTERN = Hash.new do |h, k| + delim, interpreted = *k + # delim = delim.dup # workaround for old Ruby + delim_pattern = Regexp.escape(delim) + if closing_paren = CLOSING_PAREN[delim] + delim_pattern << Regexp.escape(closing_paren) + end + delim_pattern << '\\\\' unless delim == '\\' + + # special_escapes = + # case interpreted + # when :regexp_symbols + # '| [|?*+(){}\[\].^$]' + # end + + h[k] = + if interpreted && delim != '#' + / (?= [#{delim_pattern}] | \# [{$@] ) /mx + else + / (?= [#{delim_pattern}] ) /mx + end + end + + def initialize kind, interpreted, delim, heredoc = false + if heredoc + pattern = heredoc_pattern delim, interpreted, heredoc == :indented + delim = nil + else + pattern = STRING_PATTERN[ [delim, interpreted] ] + if closing_paren = CLOSING_PAREN[delim] + opening_paren = delim + delim = closing_paren + paren_depth = 1 + end + end + super kind, interpreted, delim, heredoc, opening_paren, paren_depth, pattern, :initial + end + + def heredoc_pattern delim, interpreted, indented + # delim = delim.dup # workaround for old Ruby + delim_pattern = Regexp.escape(delim) + delim_pattern = / (?:\A|\n) #{ '(?>[ \t]*)' if indented } #{ Regexp.new delim_pattern } $ /x + if interpreted + / (?= #{delim_pattern}() | \\ | \# [{$@] ) /mx # $1 set == end of heredoc + else + / (?= #{delim_pattern}() | \\ ) /mx + end + end + + end + + end + +end +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/04/04fbda284b00bec052d898fc58aac289855e9000.svn-base --- /dev/null +++ b/.svn/pristine/04/04fbda284b00bec052d898fc58aac289855e9000.svn-base @@ -0,0 +1,8 @@ +class Wiki < ActiveRecord::Base + generator_for :start_page => 'Start' + generator_for :project, :method => :generate_project + + def self.generate_project + Project.generate! + end +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/05/05366a1767d0cebdb112d7b0a839d8704040e98a.svn-base --- /dev/null +++ b/.svn/pristine/05/05366a1767d0cebdb112d7b0a839d8704040e98a.svn-base @@ -0,0 +1,24 @@ +#!/usr/bin/env ruby +# +# You may specify the path to the FastCGI crash log (a log of unhandled +# exceptions which forced the FastCGI instance to exit, great for debugging) +# and the number of requests to process before running garbage collection. +# +# By default, the FastCGI crash log is RAILS_ROOT/log/fastcgi.crash.log +# and the GC period is nil (turned off). A reasonable number of requests +# could range from 10-100 depending on the memory footprint of your app. +# +# Example: +# # Default log path, normal GC behavior. +# RailsFCGIHandler.process! +# +# # Default log path, 50 requests between GC. +# RailsFCGIHandler.process! nil, 50 +# +# # Custom log path, normal GC behavior. +# RailsFCGIHandler.process! '/var/log/myapp_fcgi_crash.log' +# +require File.dirname(__FILE__) + "/../config/environment" +require 'fcgi_handler' + +RailsFCGIHandler.process! diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/05/053c71b830593b5a759e13f9676269b7c9bf4645.svn-base --- /dev/null +++ b/.svn/pristine/05/053c71b830593b5a759e13f9676269b7c9bf4645.svn-base @@ -0,0 +1,47 @@ +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +class IssueCategory < ActiveRecord::Base + belongs_to :project + belongs_to :assigned_to, :class_name => 'Principal', :foreign_key => 'assigned_to_id' + has_many :issues, :foreign_key => 'category_id', :dependent => :nullify + + validates_presence_of :name + validates_uniqueness_of :name, :scope => [:project_id] + validates_length_of :name, :maximum => 30 + + attr_protected :project_id + + named_scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}} + + alias :destroy_without_reassign :destroy + + # Destroy the category + # If a category is specified, issues are reassigned to this category + def destroy(reassign_to = nil) + if reassign_to && reassign_to.is_a?(IssueCategory) && reassign_to.project == self.project + Issue.update_all("category_id = #{reassign_to.id}", "category_id = #{id}") + end + destroy_without_reassign + end + + def <=>(category) + name <=> category.name + end + + def to_s; name end +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/05/053ccbadc6aeeda1db20f88d64520439b568415d.svn-base --- /dev/null +++ b/.svn/pristine/05/053ccbadc6aeeda1db20f88d64520439b568415d.svn-base @@ -0,0 +1,21 @@ +# encoding: utf-8 +# +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +module AccountHelper +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/05/058be0b3a53e81bfbd2f18f23f7014355fe7cd0a.svn-base --- /dev/null +++ b/.svn/pristine/05/058be0b3a53e81bfbd2f18f23f7014355fe7cd0a.svn-base @@ -0,0 +1,150 @@ +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require File.expand_path('../../test_helper', __FILE__) + +class MemberTest < ActiveSupport::TestCase + fixtures :projects, :trackers, :issue_statuses, :issues, + :enumerations, :users, :issue_categories, + :projects_trackers, + :roles, + :member_roles, + :members, + :enabled_modules, + :workflows, + :groups_users, + :watchers, + :journals, :journal_details, + :messages, + :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions, + :boards + + def setup + @jsmith = Member.find(1) + end + + def test_create + member = Member.new(:project_id => 1, :user_id => 4, :role_ids => [1, 2]) + assert member.save + member.reload + + assert_equal 2, member.roles.size + assert_equal Role.find(1), member.roles.sort.first + end + + def test_update + assert_equal "eCookbook", @jsmith.project.name + assert_equal "Manager", @jsmith.roles.first.name + assert_equal "jsmith", @jsmith.user.login + + @jsmith.mail_notification = !@jsmith.mail_notification + assert @jsmith.save + end + + def test_update_roles + assert_equal 1, @jsmith.roles.size + @jsmith.role_ids = [1, 2] + assert @jsmith.save + assert_equal 2, @jsmith.reload.roles.size + end + + def test_validate + member = Member.new(:project_id => 1, :user_id => 2, :role_ids => [2]) + # same use can't have more than one membership for a project + assert !member.save + + member = Member.new(:project_id => 1, :user_id => 2, :role_ids => []) + # must have one role at least + assert !member.save + end + + def test_destroy + assert_difference 'Member.count', -1 do + assert_difference 'MemberRole.count', -1 do + @jsmith.destroy + end + end + + assert_raise(ActiveRecord::RecordNotFound) { Member.find(@jsmith.id) } + end + + context "removing permissions" do + setup do + Watcher.delete_all("user_id = 9") + user = User.find(9) + # public + Watcher.create!(:watchable => Issue.find(1), :user => user) + # private + Watcher.create!(:watchable => Issue.find(4), :user => user) + Watcher.create!(:watchable => Message.find(7), :user => user) + Watcher.create!(:watchable => Wiki.find(2), :user => user) + Watcher.create!(:watchable => WikiPage.find(3), :user => user) + end + + context "of user" do + setup do + @member = Member.create!(:project => Project.find(2), :principal => User.find(9), :role_ids => [1, 2]) + end + + context "by deleting membership" do + should "prune watchers" do + assert_difference 'Watcher.count', -4 do + @member.destroy + end + end + end + + context "by updating roles" do + should "prune watchers" do + Role.find(2).remove_permission! :view_wiki_pages + member = Member.first(:order => 'id desc') + assert_difference 'Watcher.count', -2 do + member.role_ids = [2] + member.save + end + assert !Message.find(7).watched_by?(@user) + end + end + end + + context "of group" do + setup do + group = Group.find(10) + @member = Member.create!(:project => Project.find(2), :principal => group, :role_ids => [1, 2]) + group.users << User.find(9) + end + + context "by deleting membership" do + should "prune watchers" do + assert_difference 'Watcher.count', -4 do + @member.destroy + end + end + end + + context "by updating roles" do + should "prune watchers" do + Role.find(2).remove_permission! :view_wiki_pages + assert_difference 'Watcher.count', -2 do + @member.role_ids = [2] + @member.save + end + end + end + end + end +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/05/05d53773172688f95b7f90e6ffa69f1cbdf7504b.svn-base --- /dev/null +++ b/.svn/pristine/05/05d53773172688f95b7f90e6ffa69f1cbdf7504b.svn-base @@ -0,0 +1,97 @@ +| ID | <%= h(@changeset.scmid) %> | +
| <%= l(:label_parent_revision) %> | ++ <%= @changeset.parents.collect{ + |p| link_to_revision(p, @project, :text => format_revision(p)) + }.join(", ") %> + | +
| <%= l(:label_child_revision) %> | ++ <%= @changeset.children.collect{ + |p| link_to_revision(p, @project, :text => format_revision(p)) + }.join(", ") %> + | +
+ +
+ +<%= textilizable @changeset.comments %> + +<% if @changeset.issues.visible.any? %> +<%= link_to(l(:label_view_diff), + :action => 'diff', + :id => @project, + :path => "", + :rev => @changeset.identifier) if @changeset.changes.any? %>
+ +<%= render :partial => 'link_to_functions' %>
+ +<%= render_properties(@properties) %> + +<%= render(:partial => 'revisions', + :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %> + +<% html_title(l(:label_change_plural)) -%> diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/06/06b89fac956f5eaa8ae34a2daf2088c102b5cfb1.svn-base --- /dev/null +++ b/.svn/pristine/06/06b89fac956f5eaa8ae34a2daf2088c102b5cfb1.svn-base @@ -0,0 +1,136 @@ +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +class Enumeration < ActiveRecord::Base + default_scope :order => "#{Enumeration.table_name}.position ASC" + + belongs_to :project + + acts_as_list :scope => 'type = \'#{type}\'' + acts_as_customizable + acts_as_tree :order => 'position ASC' + + before_destroy :check_integrity + before_save :check_default + + validates_presence_of :name + validates_uniqueness_of :name, :scope => [:type, :project_id] + validates_length_of :name, :maximum => 30 + + named_scope :shared, :conditions => { :project_id => nil } + named_scope :active, :conditions => { :active => true } + named_scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}} + + def self.default + # Creates a fake default scope so Enumeration.default will check + # it's type. STI subclasses will automatically add their own + # types to the finder. + if self.descends_from_active_record? + find(:first, :conditions => { :is_default => true, :type => 'Enumeration' }) + else + # STI classes are + find(:first, :conditions => { :is_default => true }) + end + end + + # Overloaded on concrete classes + def option_name + nil + end + + def check_default + if is_default? && is_default_changed? + Enumeration.update_all("is_default = #{connection.quoted_false}", {:type => type}) + end + end + + # Overloaded on concrete classes + def objects_count + 0 + end + + def in_use? + self.objects_count != 0 + end + + # Is this enumeration overiding a system level enumeration? + def is_override? + !self.parent.nil? + end + + alias :destroy_without_reassign :destroy + + # Destroy the enumeration + # If a enumeration is specified, objects are reassigned + def destroy(reassign_to = nil) + if reassign_to && reassign_to.is_a?(Enumeration) + self.transfer_relations(reassign_to) + end + destroy_without_reassign + end + + def <=>(enumeration) + position <=> enumeration.position + end + + def to_s; name end + + # Returns the Subclasses of Enumeration. Each Subclass needs to be + # required in development mode. + # + # Note: subclasses is protected in ActiveRecord + def self.get_subclasses + @@subclasses[Enumeration] + end + + # Does the +new+ Hash override the previous Enumeration? + def self.overridding_change?(new, previous) + if (same_active_state?(new['active'], previous.active)) && same_custom_values?(new,previous) + return false + else + return true + end + end + + # Does the +new+ Hash have the same custom values as the previous Enumeration? + def self.same_custom_values?(new, previous) + previous.custom_field_values.each do |custom_value| + if custom_value.value != new["custom_field_values"][custom_value.custom_field_id.to_s] + return false + end + end + + return true + end + + # Are the new and previous fields equal? + def self.same_active_state?(new, previous) + new = (new == "1" ? true : false) + return new == previous + end + +private + def check_integrity + raise "Can't delete enumeration" if self.in_use? + end + +end + +# Force load the subclasses in development mode +require_dependency 'time_entry_activity' +require_dependency 'document_category' +require_dependency 'issue_priority' diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/06/06b934af3bce9be376de55c695a81c0e464edbd4.svn-base --- /dev/null +++ b/.svn/pristine/06/06b934af3bce9be376de55c695a81c0e464edbd4.svn-base @@ -0,0 +1,40 @@ +# Copyright (c) 2006 4ssoM LLC<%= l(:label_no_data) %>
<% end %> + +<% members = @members.group_by {|m| m.role } %> +<% members.keys.sort{|x,y| x.position <=> y.position}.each do |role| %> +| + <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> + <%=l(:label_current_status)%> + | +<%=l(:label_new_statuses_allowed)%> | +
|---|---|
| + <% for new_status in @statuses %> + | + <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input.new-status-#{new_status.id}')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> + <%=h new_status.name %> + | + <% end %> +
| + <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.id}')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> + + <%=h old_status.name %> + | + <% for new_status in @statuses -%> ++ <%= check_box_tag "issue_status[#{ old_status.id }][#{new_status.id}][]", name, workflows.detect {|w| w.old_status_id == old_status.id && w.new_status_id == new_status.id}, + :class => "old-status-#{old_status.id} new-status-#{new_status.id}" %> + | + <% end -%> +
+ <%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %>
+
<%= l(:text_line_separated) %>
+
<%= setting_check_box :mail_handler_api_enabled, + :onclick => "if (this.checked) { Form.Element.enable('settings_mail_handler_api_key'); } else { Form.Element.disable('settings_mail_handler_api_key'); }"%>
+ +<%= setting_text_field :mail_handler_api_key, :size => 30, + :id => 'settings_mail_handler_api_key', + :disabled => !Setting.mail_handler_api_enabled? %> + <%= link_to_function l(:label_generate_key), "if ($('settings_mail_handler_api_key').disabled == false) { $('settings_mail_handler_api_key').value = randomKey(20) }" %> +
++<% form_tag({}, :method => 'get') do %> + + <%= select_tag 'type', + options_for_select( + [[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), + :onchange => "if (this.value != '') {this.form.submit()}" %> +<% end %> +
+<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %> + +<% html_title @attachment.filename %> + +<% content_for :header_tags do -%> + <%= stylesheet_link_tag "scm" -%> +<% end -%> diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/0c/0c07ac7fadf7713b8982de217779de9a2084825c.svn-base --- /dev/null +++ b/.svn/pristine/0c/0c07ac7fadf7713b8982de217779de9a2084825c.svn-base @@ -0,0 +1,70 @@ +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +class Group < Principal + has_and_belongs_to_many :users, :after_add => :user_added, + :after_remove => :user_removed + + acts_as_customizable + + validates_presence_of :lastname + validates_uniqueness_of :lastname, :case_sensitive => false + validates_length_of :lastname, :maximum => 30 + + before_destroy :remove_references_before_destroy + + def to_s + lastname.to_s + end + + alias :name :to_s + + def user_added(user) + members.each do |member| + next if member.project.nil? + user_member = Member.find_by_project_id_and_user_id(member.project_id, user.id) || Member.new(:project_id => member.project_id, :user_id => user.id) + member.member_roles.each do |member_role| + user_member.member_roles << MemberRole.new(:role => member_role.role, :inherited_from => member_role.id) + end + user_member.save! + end + end + + def user_removed(user) + members.each do |member| + MemberRole.find(:all, :include => :member, + :conditions => ["#{Member.table_name}.user_id = ? AND #{MemberRole.table_name}.inherited_from IN (?)", user.id, member.member_role_ids]).each(&:destroy) + end + end + + def self.human_attribute_name(attribute_key_name) + attr_name = attribute_key_name + if attr_name == 'lastname' + attr_name = "name" + end + super(attr_name) + end + + private + + # Removes references that are not handled by associations + def remove_references_before_destroy + return if self.id.nil? + + Issue.update_all 'assigned_to_id = NULL', ['assigned_to_id = ?', id] + end +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/0c/0c29497a56078e0463be76e7192d98e2c38a77c5.svn-base --- /dev/null +++ b/.svn/pristine/0c/0c29497a56078e0463be76e7192d98e2c38a77c5.svn-base @@ -0,0 +1,18 @@ +// Translated by: Alexandre da Silva| + <%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %> + | +|||
|---|---|---|---|
| ... | ... | + | |
| <%= line.nb_line_left %> | +
+ <%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_left) %>+ |
+ <%= line.nb_line_right %> | +
+ <%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_right) %>+ |
+
| + <%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %> + | +||
|---|---|---|
| ... | ... | + |
| <%= line.nb_line_left %> | +<%= line.nb_line_right %> | +
+ <%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line) %>+ |
+
<%= f.text_field :issue_id, :size => 6 %> <%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %>
+<%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %>
+<%= f.text_field :hours, :size => 6, :required => true %>
+<%= f.text_field :comments, :size => 100 %>
+<%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %>
+<% @time_entry.custom_field_values.each do |value| %> +<%= custom_field_tag_with_label :time_entry, value %>
+<% end %> +<%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %> +| <%= l(:label_user) %> | ++ |
|---|---|
| <%= link_to_user user %> | ++ <%= link_to_remote l(:button_delete), { :url => group_user_path(@group, :user_id => user), :method => :delete }, :class => 'icon icon-del' %> + | +
<%= l(:label_no_data) %>
+<% end %> +<%= setting_text_field :mail_from, :size => 60 %>
+ +<%= setting_check_box :bcc_recipients %>
+ +<%= setting_check_box :plain_text_mail %>
+ +<%= setting_select(:default_notification_option, User.valid_notification_options.collect {|o| [l(o.last), o.first.to_s]}) %>
+ +| <%= l(:label_board) %> | +<%= l(:field_description) %> | ++ | + |
|---|---|---|---|
| <%=h board.name %> | +<%=h board.description %> | ++ <% if authorize_for("boards", "edit") %> + <%= reorder_links('board', {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board}) %> + <% end %> + | ++ <%= link_to_if_authorized l(:button_edit), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board}, :class => 'icon icon-edit' %> + <%= link_to_if_authorized l(:button_delete), {:controller => 'boards', :action => 'destroy', :project_id => @project, :id => board}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> + | +
<%= l(:label_no_data) %>
+<% end %> + +<%= link_to_if_authorized l(:label_board_new), {:controller => 'boards', :action => 'new', :project_id => @project}, :class => 'icon icon-add' %>
diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/12/12d2aa017b97ff487eca5cc334afe4f6ec1d0dc6.svn-base --- /dev/null +++ b/.svn/pristine/12/12d2aa017b97ff487eca5cc334afe4f6ec1d0dc6.svn-base @@ -0,0 +1,26 @@ +class NotifyMail < ActionMailer::Base + + helper :mail + + def signup(txt) + body(:name => txt) + end + + def multipart + recipients 'some_address@email.com' + subject 'multi part email' + from "another_user@email.com" + content_type 'multipart/alternative' + + part :content_type => "text/html", :body => render_message("multipart_html", {}) + part "text/plain" do |p| + p.body = render_message("multipart_plain", {}) + end + end + + def implicit_multipart + recipients 'some_address@email.com' + subject 'multi part email' + from "another_user@email.com" + end +end \ No newline at end of file diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/12/12deb41d009d058f51dd523cc9acb26b734732d9.svn-base Binary file .svn/pristine/12/12deb41d009d058f51dd523cc9acb26b734732d9.svn-base has changed diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/13/130043bdfae755b8a2fcb2b00201feff2d982de9.svn-base --- /dev/null +++ b/.svn/pristine/13/130043bdfae755b8a2fcb2b00201feff2d982de9.svn-base @@ -0,0 +1,9 @@ +default: + somesetting: foo + +production: + +development: + +test: + somesetting: bar diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/13/134682aa67acff21c24711968698972a9dfb0d8a.svn-base --- /dev/null +++ b/.svn/pristine/13/134682aa67acff21c24711968698972a9dfb0d8a.svn-base @@ -0,0 +1,6 @@ +: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'], + [l(:label_month), 'month'], + [l(:label_week), 'week'], + [l(:label_day_plural).titleize, 'day']], @columns), + :onchange => "this.form.onsubmit();" %> + + : <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}), + :onchange => "this.form.submit();", + :style => 'width: 200px', + :id => nil, + :disabled => (@criterias.length >= 3), :id => "criterias") %> + <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns}, :class => 'icon icon-reload' %>
+<% end %> + +<% unless @criterias.empty? %> +<%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %>
+| <%= l_or_humanize(@available_criterias[criteria][:label]) %> | +<% end %> +<% columns_width = (40 / (@periods.length+1)).to_i %> +<% @periods.each do |period| %> +<%= period %> | +<% end %> +<%= l(:label_total) %> | +|
|---|---|---|---|
| <%= l(:label_total) %> | + <%= '' * (@criterias.size - 1) %> + <% total = 0 -%> + <% @periods.each do |period| -%> + <% sum = sum_hours(select_hours(@hours, @columns, period.to_s)); total += sum -%> + | <%= html_hours("%.2f" % sum) if sum > 0 %> | + <% end -%> +<%= html_hours("%.2f" % total) if total > 0 %> | +
<%= f.text_field :name, :required => true %>
+<%= f.text_field :description, :required => true, :size => 80 %>
+<%= link_to_revision(changeset, changeset.project,
+ :text => "#{l(:label_revision)} #{changeset.format_identifier}") %>
+
<%= pref_fields.check_box :hide_mail %>
+<%= pref_fields.select :time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %>
+<%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %>
+<%= pref_fields.check_box :warn_on_leaving_unsaved %>
+<% end %> + diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/14/14f249183ef33935d6a7aa11b5f44b945eb0da01.svn-base --- /dev/null +++ b/.svn/pristine/14/14f249183ef33935d6a7aa11b5f44b945eb0da01.svn-base @@ -0,0 +1,15 @@ +<%= error_messages_for 'document' %> ++<%= select('document', 'category_id', DocumentCategory.active.collect {|c| [c.name, c.id]}) %>
+ ++<%= text_field 'document', 'title', :size => 60 %>
+ ++<%= text_area 'document', 'description', :cols => 60, :rows => 15, :class => 'wiki-edit' %>
+ +| ', ' |
| <%=h plugin.name %> + <%= content_tag('span', h(plugin.description), :class => 'description') unless plugin.description.blank? %> + <%= content_tag('span', link_to(h(plugin.url), plugin.url), :class => 'url') unless plugin.url.blank? %> + | +<%= plugin.author_url.blank? ? h(plugin.author) : link_to(h(plugin.author), plugin.author_url) %> | +<%=h plugin.version %> | +<%= link_to(l(:button_configure), :controller => 'settings', :action => 'plugin', :id => plugin.id) if plugin.configurable? %> | +
<%= l(:label_no_data) %>
+<% end %> diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/17/17c033d2aba8bd48a0c5240eb040a0c6c95834ea.svn-base --- /dev/null +++ b/.svn/pristine/17/17c033d2aba8bd48a0c5240eb040a0c6c95834ea.svn-base @@ -0,0 +1,12 @@ +class IssueMove < ActiveRecord::Migration + # model removed + class Permission < ActiveRecord::Base; end + + def self.up + Permission.create :controller => "projects", :action => "move_issues", :description => "button_move", :sort => 1061, :mail_option => 0, :mail_enabled => 0 + end + + def self.down + Permission.find(:first, :conditions => ["controller=? and action=?", 'projects', 'move_issues']).destroy + end +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/17/17c53021398a51ccae878d86cdd4f0a66880e996.svn-base --- /dev/null +++ b/.svn/pristine/17/17c53021398a51ccae878d86cdd4f0a66880e996.svn-base @@ -0,0 +1,14 @@ +class AddCommentsPermissions < ActiveRecord::Migration + # model removed + class Permission < ActiveRecord::Base; end + + def self.up + Permission.create :controller => "news", :action => "add_comment", :description => "label_comment_add", :sort => 1130, :is_public => false, :mail_option => 0, :mail_enabled => 0 + Permission.create :controller => "news", :action => "destroy_comment", :description => "label_comment_delete", :sort => 1133, :is_public => false, :mail_option => 0, :mail_enabled => 0 + end + + def self.down + Permission.find(:first, :conditions => ["controller=? and action=?", 'news', 'add_comment']).destroy + Permission.find(:first, :conditions => ["controller=? and action=?", 'news', 'destroy_comment']).destroy + end +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/17/17d43ea055a7a8001dad09ba9decc118c095d5fe.svn-base --- /dev/null +++ b/.svn/pristine/17/17d43ea055a7a8001dad09ba9decc118c095d5fe.svn-base @@ -0,0 +1,55 @@ +<% labelled_tabular_form_for :issue, @issue, + :url => {:action => 'update', :id => @issue}, + :html => {:id => 'issue-form', + :class => nil, + :method => :put, + :multipart => true} do |f| %> + <%= error_messages_for 'issue', 'time_entry' %> +<%= l(:label_no_data) %>
+<% else %> +<% @newss.each do |news| %> +<%= pagination_links_full @news_pages %>
+ +<% other_formats_links do |f| %> + <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %> +<% end %> + +<% content_for :header_tags do %> + <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> + <%= stylesheet_link_tag 'scm' %> +<% end %> + +<% html_title(l(:label_news_plural)) -%> diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/18/18852f098b25cd84eb6339e96750fe88239d356c.svn-base --- /dev/null +++ b/.svn/pristine/18/18852f098b25cd84eb6339e96750fe88239d356c.svn-base @@ -0,0 +1,178 @@ +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require File.expand_path('../../test_helper', __FILE__) +require 'pp' +class RepositoryCvsTest < ActiveSupport::TestCase + fixtures :projects + + REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s + REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin? + # CVS module + MODULE_NAME = 'test' + CHANGESETS_NUM = 7 + + def setup + @project = Project.find(3) + @repository = Repository::Cvs.create(:project => @project, + :root_url => REPOSITORY_PATH, + :url => MODULE_NAME, + :log_encoding => 'UTF-8') + assert @repository + end + + if File.directory?(REPOSITORY_PATH) + def test_fetch_changesets_from_scratch + assert_equal 0, @repository.changesets.count + @repository.fetch_changesets + @project.reload + + assert_equal CHANGESETS_NUM, @repository.changesets.count + assert_equal 16, @repository.changes.count + assert_not_nil @repository.changesets.find_by_comments('Two files changed') + + r2 = @repository.changesets.find_by_revision('2') + assert_equal 'v1-20071213-162510', r2.scmid + end + + def test_fetch_changesets_incremental + assert_equal 0, @repository.changesets.count + @repository.fetch_changesets + # Remove changesets with revision > 3 + @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 3} + @repository.reload + assert_equal 3, @repository.changesets.count + assert_equal %w|3 2 1|, @repository.changesets.collect(&:revision) + + rev3_commit = @repository.changesets.find(:first, :order => 'committed_on DESC') + assert_equal '3', rev3_commit.revision + # 2007-12-14 01:27:22 +0900 + rev3_committed_on = Time.gm(2007, 12, 13, 16, 27, 22) + assert_equal 'HEAD-20071213-162722', rev3_commit.scmid + assert_equal rev3_committed_on, rev3_commit.committed_on + latest_rev = @repository.latest_changeset + assert_equal rev3_committed_on, latest_rev.committed_on + + @repository.fetch_changesets + @repository.reload + assert_equal CHANGESETS_NUM, @repository.changesets.count + + assert_equal %w|7 6 5 4 3 2 1|, @repository.changesets.collect(&:revision) + rev5_commit = @repository.changesets.find_by_revision('5') + assert_equal 'HEAD-20071213-163001', rev5_commit.scmid + # 2007-12-14 01:30:01 +0900 + rev5_committed_on = Time.gm(2007, 12, 13, 16, 30, 1) + assert_equal rev5_committed_on, rev5_commit.committed_on + end + + def test_deleted_files_should_not_be_listed + assert_equal 0, @repository.changesets.count + @repository.fetch_changesets + @project.reload + assert_equal CHANGESETS_NUM, @repository.changesets.count + + entries = @repository.entries('sources') + assert entries.detect {|e| e.name == 'watchers_controller.rb'} + assert_nil entries.detect {|e| e.name == 'welcome_controller.rb'} + end + + def test_entries_rev3 + assert_equal 0, @repository.changesets.count + @repository.fetch_changesets + @project.reload + assert_equal CHANGESETS_NUM, @repository.changesets.count + entries = @repository.entries('', '3') + assert_equal 3, entries.size + assert_equal entries[2].name, "README" + assert_equal entries[2].lastrev.time, Time.gm(2007, 12, 13, 16, 27, 22) + assert_equal entries[2].lastrev.identifier, '3' + assert_equal entries[2].lastrev.revision, '3' + assert_equal entries[2].lastrev.author, 'LANG' + end + + def test_entries_invalid_path + assert_equal 0, @repository.changesets.count + @repository.fetch_changesets + @project.reload + assert_equal CHANGESETS_NUM, @repository.changesets.count + assert_nil @repository.entries('missing') + assert_nil @repository.entries('missing', '3') + end + + def test_entries_invalid_revision + assert_equal 0, @repository.changesets.count + @repository.fetch_changesets + @project.reload + assert_equal CHANGESETS_NUM, @repository.changesets.count + assert_nil @repository.entries('', '123') + end + + def test_cat + assert_equal 0, @repository.changesets.count + @repository.fetch_changesets + @project.reload + assert_equal CHANGESETS_NUM, @repository.changesets.count + buf = @repository.cat('README') + assert buf + lines = buf.split("\n") + assert_equal 3, lines.length + buf = lines[1].gsub(/\r$/, "") + assert_equal 'with one change', buf + buf = @repository.cat('README', '1') + assert buf + lines = buf.split("\n") + assert_equal 1, lines.length + buf = lines[0].gsub(/\r$/, "") + assert_equal 'CVS test repository', buf + assert_nil @repository.cat('missing.rb') + + # sources/welcome_controller.rb is removed at revision 5. + assert @repository.cat('sources/welcome_controller.rb', '4') + assert @repository.cat('sources/welcome_controller.rb', '5').blank? + + # invalid revision + assert @repository.cat('README', '123').blank? + end + + def test_annotate + assert_equal 0, @repository.changesets.count + @repository.fetch_changesets + @project.reload + assert_equal CHANGESETS_NUM, @repository.changesets.count + ann = @repository.annotate('README') + assert ann + assert_equal 3, ann.revisions.length + assert_equal '1.2', ann.revisions[1].revision + assert_equal 'LANG', ann.revisions[1].author + assert_equal 'with one change', ann.lines[1] + + ann = @repository.annotate('README', '1') + assert ann + assert_equal 1, ann.revisions.length + assert_equal '1.1', ann.revisions[0].revision + assert_equal 'LANG', ann.revisions[0].author + assert_equal 'CVS test repository', ann.lines[0] + + # invalid revision + assert_nil @repository.annotate('README', '123') + end + + else + puts "CVS test repository NOT FOUND. Skipping unit tests !!!" + def test_fake; assert true end + end +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/18/1885ce921d043d16f90840164f06199bb85e23a9.svn-base --- /dev/null +++ b/.svn/pristine/18/1885ce921d043d16f90840164f06199bb85e23a9.svn-base @@ -0,0 +1,114 @@ +require File.expand_path('../../test_helper', __FILE__) + +class ActivitiesControllerTest < ActionController::TestCase + fixtures :projects, :trackers, :issue_statuses, :issues, + :enumerations, :users, :issue_categories, + :projects_trackers, + :roles, + :member_roles, + :members, + :groups_users, + :enabled_modules, + :workflows, + :auth_sources, + :journals, :journal_details + + + def test_project_index + get :index, :id => 1, :with_subprojects => 0 + assert_response :success + assert_template 'index' + assert_not_nil assigns(:events_by_day) + + assert_tag :tag => "h3", + :content => /#{2.days.ago.to_date.day}/, + :sibling => { :tag => "dl", + :child => { :tag => "dt", + :attributes => { :class => /issue-edit/ }, + :child => { :tag => "a", + :content => /(#{IssueStatus.find(2).name})/, + } + } + } + end + + def test_project_index_with_invalid_project_id_should_respond_404 + get :index, :id => 299 + assert_response 404 + end + + def test_previous_project_index + get :index, :id => 1, :from => 3.days.ago.to_date + assert_response :success + assert_template 'index' + assert_not_nil assigns(:events_by_day) + + assert_tag :tag => "h3", + :content => /#{3.day.ago.to_date.day}/, + :sibling => { :tag => "dl", + :child => { :tag => "dt", + :attributes => { :class => /issue/ }, + :child => { :tag => "a", + :content => /#{Issue.find(1).subject}/, + } + } + } + end + + def test_global_index + get :index + assert_response :success + assert_template 'index' + assert_not_nil assigns(:events_by_day) + + assert_tag :tag => "h3", + :content => /#{5.day.ago.to_date.day}/, + :sibling => { :tag => "dl", + :child => { :tag => "dt", + :attributes => { :class => /issue/ }, + :child => { :tag => "a", + :content => /#{Issue.find(5).subject}/, + } + } + } + end + + def test_user_index + get :index, :user_id => 2 + assert_response :success + assert_template 'index' + assert_not_nil assigns(:events_by_day) + + assert_tag :tag => "h3", + :content => /#{3.day.ago.to_date.day}/, + :sibling => { :tag => "dl", + :child => { :tag => "dt", + :attributes => { :class => /issue/ }, + :child => { :tag => "a", + :content => /#{Issue.find(1).subject}/, + } + } + } + end + + def test_user_index_with_invalid_user_id_should_respond_404 + get :index, :user_id => 299 + assert_response 404 + end + + def test_index_atom_feed + get :index, :format => 'atom' + assert_response :success + assert_template 'common/feed.atom' + assert_tag :tag => 'entry', :child => { + :tag => 'link', + :attributes => {:href => 'http://test.host/issues/11'}} + end + + def test_index_atom_feed_with_one_item_type + get :index, :format => 'atom', :show_issues => '1' + assert_response :success + assert_template 'common/feed.atom' + assert_tag :tag => 'title', :content => /Issues/ + end +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/18/189e42fe562dc8e6777fdc048ca3ef1e55e522e9.svn-base --- /dev/null +++ b/.svn/pristine/18/189e42fe562dc8e6777fdc048ca3ef1e55e522e9.svn-base @@ -0,0 +1,1 @@ +the implicit html part of the email <%= do_something_helpful("semaj") %> \ No newline at end of file diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/18/18a09954a05a5ec15a7caae7ea49a3f1f212aec3.svn-base --- /dev/null +++ b/.svn/pristine/18/18a09954a05a5ec15a7caae7ea49a3f1f212aec3.svn-base @@ -0,0 +1,81 @@ +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require File.expand_path('../../../../../../test_helper', __FILE__) + +class Redmine::Views::Builders::JsonTest < ActiveSupport::TestCase + + def test_hash + assert_json_output({'person' => {'name' => 'Ryan', 'age' => 32}}) do |b| + b.person do + b.name 'Ryan' + b.age 32 + end + end + end + + def test_hash_hash + assert_json_output({'person' => {'name' => 'Ryan', 'birth' => {'city' => 'London', 'country' => 'UK'}}}) do |b| + b.person do + b.name 'Ryan' + b.birth :city => 'London', :country => 'UK' + end + end + + assert_json_output({'person' => {'id' => 1, 'name' => 'Ryan', 'birth' => {'city' => 'London', 'country' => 'UK'}}}) do |b| + b.person :id => 1 do + b.name 'Ryan' + b.birth :city => 'London', :country => 'UK' + end + end + end + + def test_array + assert_json_output({'books' => [{'title' => 'Book 1', 'author' => 'B. Smith'}, {'title' => 'Book 2', 'author' => 'G. Cooper'}]}) do |b| + b.array :books do |b| + b.book :title => 'Book 1', :author => 'B. Smith' + b.book :title => 'Book 2', :author => 'G. Cooper' + end + end + + assert_json_output({'books' => [{'title' => 'Book 1', 'author' => 'B. Smith'}, {'title' => 'Book 2', 'author' => 'G. Cooper'}]}) do |b| + b.array :books do |b| + b.book :title => 'Book 1' do + b.author 'B. Smith' + end + b.book :title => 'Book 2' do + b.author 'G. Cooper' + end + end + end + end + + def test_array_with_content_tags + assert_json_output({'books' => [{'value' => 'Book 1', 'author' => 'B. Smith'}, {'value' => 'Book 2', 'author' => 'G. Cooper'}]}) do |b| + b.array :books do |b| + b.book 'Book 1', :author => 'B. Smith' + b.book 'Book 2', :author => 'G. Cooper' + end + end + end + + def assert_json_output(expected, &block) + builder = Redmine::Views::Builders::Json.new + block.call(builder) + assert_equal(expected, ActiveSupport::JSON.decode(builder.output)) + end +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/18/18c59fd3cf0be9bce51b1494294c8021fdeabf7d.svn-base --- /dev/null +++ b/.svn/pristine/18/18c59fd3cf0be9bce51b1494294c8021fdeabf7d.svn-base @@ -0,0 +1,6 @@ +<%= f.select :user_id, (watched.addable_watcher_users.collect {|m| [m.name, m.id]}), :prompt => "--- #{l(:actionview_instancetag_blank_option)} ---" %> + + <%= submit_tag l(:button_add) %> + <%= toggle_link l(:button_cancel), 'new-watcher-form'%>
+ <% end %> +<% end %> + +<%= watchers_list(watched) %> diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/1a/1a8a501f625f400265586ffe68a1c06c8affc4fc.svn-base --- /dev/null +++ b/.svn/pristine/1a/1a8a501f625f400265586ffe68a1c06c8affc4fc.svn-base @@ -0,0 +1,63 @@ +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require File.expand_path('../../../../../test_helper', __FILE__) + +class CalendarTest < ActiveSupport::TestCase + + def test_monthly + c = Redmine::Helpers::Calendar.new(Date.today, :fr, :month) + assert_equal [1, 7], [c.startdt.cwday, c.enddt.cwday] + + c = Redmine::Helpers::Calendar.new('2007-07-14'.to_date, :fr, :month) + assert_equal ['2007-06-25'.to_date, '2007-08-05'.to_date], [c.startdt, c.enddt] + + c = Redmine::Helpers::Calendar.new(Date.today, :en, :month) + assert_equal [7, 6], [c.startdt.cwday, c.enddt.cwday] + end + + def test_weekly + c = Redmine::Helpers::Calendar.new(Date.today, :fr, :week) + assert_equal [1, 7], [c.startdt.cwday, c.enddt.cwday] + + c = Redmine::Helpers::Calendar.new('2007-07-14'.to_date, :fr, :week) + assert_equal ['2007-07-09'.to_date, '2007-07-15'.to_date], [c.startdt, c.enddt] + + c = Redmine::Helpers::Calendar.new(Date.today, :en, :week) + assert_equal [7, 6], [c.startdt.cwday, c.enddt.cwday] + end + + def test_monthly_start_day + [1, 6, 7].each do |day| + with_settings :start_of_week => day do + c = Redmine::Helpers::Calendar.new(Date.today, :en, :month) + assert_equal day , c.startdt.cwday + assert_equal (day + 5) % 7 + 1, c.enddt.cwday + end + end + end + + def test_weekly_start_day + [1, 6, 7].each do |day| + with_settings :start_of_week => day do + c = Redmine::Helpers::Calendar.new(Date.today, :en, :week) + assert_equal day, c.startdt.cwday + assert_equal (day + 5) % 7 + 1, c.enddt.cwday + end + end + end +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/1a/1a8da3d8148fac23b4f5825f6ac868a10f01d12f.svn-base --- /dev/null +++ b/.svn/pristine/1a/1a8da3d8148fac23b4f5825f6ac868a10f01d12f.svn-base @@ -0,0 +1,9 @@ +class AddMissingIndexesToUserPreferences < ActiveRecord::Migration + def self.up + add_index :user_preferences, :user_id + end + + def self.down + remove_index :user_preferences, :user_id + end +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/1a/1ab06441767b89700eccb7f62767523259a141ff.svn-base --- /dev/null +++ b/.svn/pristine/1a/1ab06441767b89700eccb7f62767523259a141ff.svn-base @@ -0,0 +1,9 @@ +class Company < ActiveRecord::Base + attr_protected :rating + set_sequence_name :companies_nonstd_seq + + validates_presence_of :name + def validate + errors.add('rating', 'rating should not be 2') if rating == 2 + end +end \ No newline at end of file diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/1a/1abc7d9bb63cfe6a27d8a0852d2c50e8db93327c.svn-base --- /dev/null +++ b/.svn/pristine/1a/1abc7d9bb63cfe6a27d8a0852d2c50e8db93327c.svn-base @@ -0,0 +1,502 @@ +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require File.expand_path('../../test_helper', __FILE__) + +class MailerTest < ActiveSupport::TestCase + include Redmine::I18n + include ActionController::Assertions::SelectorAssertions + fixtures :projects, :enabled_modules, :issues, :users, :members, + :member_roles, :roles, :documents, :attachments, :news, + :tokens, :journals, :journal_details, :changesets, :trackers, + :issue_statuses, :enumerations, :messages, :boards, :repositories, + :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions, + :versions, + :comments + + def setup + ActionMailer::Base.deliveries.clear + Setting.host_name = 'mydomain.foo' + Setting.protocol = 'http' + Setting.plain_text_mail = '0' + end + + def test_generated_links_in_emails + Setting.host_name = 'mydomain.foo' + Setting.protocol = 'https' + + journal = Journal.find(2) + assert Mailer.deliver_issue_edit(journal) + + mail = ActionMailer::Base.deliveries.last + assert_kind_of TMail::Mail, mail + + assert_select_email do + # link to the main ticket + assert_select "a[href=?]", + "https://mydomain.foo/issues/1#change-2", + :text => "Bug #1: Can't print recipes" + # link to a referenced ticket + assert_select "a[href=?][title=?]", + "https://mydomain.foo/issues/2", + "Add ingredients categories (Assigned)", + :text => "#2" + # link to a changeset + assert_select "a[href=?][title=?]", + "https://mydomain.foo/projects/ecookbook/repository/revisions/2", + "This commit fixes #1, #2 and references #1 & #3", + :text => "r2" + end + end + + def test_generated_links_with_prefix + relative_url_root = Redmine::Utils.relative_url_root + Setting.host_name = 'mydomain.foo/rdm' + Setting.protocol = 'http' + Redmine::Utils.relative_url_root = '/rdm' + + journal = Journal.find(2) + assert Mailer.deliver_issue_edit(journal) + + mail = ActionMailer::Base.deliveries.last + assert_kind_of TMail::Mail, mail + + assert_select_email do + # link to the main ticket + assert_select "a[href=?]", + "http://mydomain.foo/rdm/issues/1#change-2", + :text => "Bug #1: Can't print recipes" + # link to a referenced ticket + assert_select "a[href=?][title=?]", + "http://mydomain.foo/rdm/issues/2", + "Add ingredients categories (Assigned)", + :text => "#2" + # link to a changeset + assert_select "a[href=?][title=?]", + "http://mydomain.foo/rdm/projects/ecookbook/repository/revisions/2", + "This commit fixes #1, #2 and references #1 & #3", + :text => "r2" + end + ensure + # restore it + Redmine::Utils.relative_url_root = relative_url_root + end + + def test_generated_links_with_prefix_and_no_relative_url_root + relative_url_root = Redmine::Utils.relative_url_root + Setting.host_name = 'mydomain.foo/rdm' + Setting.protocol = 'http' + Redmine::Utils.relative_url_root = nil + + journal = Journal.find(2) + assert Mailer.deliver_issue_edit(journal) + + mail = ActionMailer::Base.deliveries.last + assert_kind_of TMail::Mail, mail + + assert_select_email do + # link to the main ticket + assert_select "a[href=?]", + "http://mydomain.foo/rdm/issues/1#change-2", + :text => "Bug #1: Can't print recipes" + # link to a referenced ticket + assert_select "a[href=?][title=?]", + "http://mydomain.foo/rdm/issues/2", + "Add ingredients categories (Assigned)", + :text => "#2" + # link to a changeset + assert_select "a[href=?][title=?]", + "http://mydomain.foo/rdm/projects/ecookbook/repository/revisions/2", + "This commit fixes #1, #2 and references #1 & #3", + :text => "r2" + end + ensure + # restore it + Redmine::Utils.relative_url_root = relative_url_root + end + + def test_email_headers + issue = Issue.find(1) + Mailer.deliver_issue_add(issue) + mail = ActionMailer::Base.deliveries.last + assert_not_nil mail + assert_equal 'OOF', mail.header_string('X-Auto-Response-Suppress') + assert_equal 'auto-generated', mail.header_string('Auto-Submitted') + end + + def test_plain_text_mail + Setting.plain_text_mail = 1 + journal = Journal.find(2) + Mailer.deliver_issue_edit(journal) + mail = ActionMailer::Base.deliveries.last + assert_equal "text/plain", mail.content_type + assert_equal 0, mail.parts.size + assert !mail.encoded.include?('href') + end + + def test_html_mail + Setting.plain_text_mail = 0 + journal = Journal.find(2) + Mailer.deliver_issue_edit(journal) + mail = ActionMailer::Base.deliveries.last + assert_equal 2, mail.parts.size + assert mail.encoded.include?('href') + end + + def test_from_header + with_settings :mail_from => 'redmine@example.net' do + Mailer.deliver_test(User.find(1)) + end + mail = ActionMailer::Base.deliveries.last + assert_not_nil mail + assert_equal 'redmine@example.net', mail.from_addrs.first.address + end + + def test_from_header_with_phrase + with_settings :mail_from => 'Redmine app| +<% end %> + | # | ++ | + | <%= l(:label_date) %> | +<%= l(:field_author) %> | +<%= l(:field_comments) %> | +|
|---|---|---|---|---|---|---|---|
| + <% href_base = Proc.new {|x| url_for(:controller => 'repositories', + :action => 'revision', + :id => project, + :rev => x) } %> + <%= render :partial => 'revision_graph', + :locals => { + :commits => index_commits( + revisions, + @repository.branches, + href_base + ) + } %> + | + <% end %> +<% end %> +<%= link_to_revision(changeset, project) %> | +<%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %> | +<%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %> | +<%= format_time(changeset.committed_on) %> | +<%= h truncate(changeset.author.to_s, :length => 30) %> | +<% if show_revision_graph %> ++ <%= textilizable(truncate(truncate_at_line_break(changeset.comments, 0), :length => 90)) %> + | +<% else %> +<%= textilizable(truncate_at_line_break(changeset.comments)) %> | +<% end %> +
<%= l(:label_no_data) %>
+<% end %> + +<%= render_page_hierarchy(@pages_by_parent_id, nil, :timestamp => true) %> + +<% content_for :sidebar do %> + <%= render :partial => 'sidebar' %> +<% end %> + +<% unless @pages.empty? %> +<% other_formats_links do |f| %> + <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %> + <%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %> +<% end %> +<% end %> + +<% content_for :header_tags do %> +<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %> +<% end %> diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/1f/1fb867d43b925bd44b6fa06a149ecabad4787c36.svn-base --- /dev/null +++ b/.svn/pristine/1f/1fb867d43b925bd44b6fa06a149ecabad4787c36.svn-base @@ -0,0 +1,141 @@ +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require File.expand_path('../../test_helper', __FILE__) +require 'admin_controller' + +# Re-raise errors caught by the controller. +class AdminController; def rescue_action(e) raise e end; end + +class AdminControllerTest < ActionController::TestCase + fixtures :projects, :users, :roles + + def setup + @controller = AdminController.new + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + User.current = nil + @request.session[:user_id] = 1 # admin + end + + def test_index + get :index + assert_no_tag :tag => 'div', + :attributes => { :class => /nodata/ } + end + + def test_index_with_no_configuration_data + delete_configuration_data + get :index + assert_tag :tag => 'div', + :attributes => { :class => /nodata/ } + end + + def test_projects + get :projects + assert_response :success + assert_template 'projects' + assert_not_nil assigns(:projects) + # active projects only + assert_nil assigns(:projects).detect {|u| !u.active?} + end + + def test_projects_with_name_filter + get :projects, :name => 'store', :status => '' + assert_response :success + assert_template 'projects' + projects = assigns(:projects) + assert_not_nil projects + assert_equal 1, projects.size + assert_equal 'OnlineStore', projects.first.name + end + + def test_load_default_configuration_data + delete_configuration_data + post :default_configuration, :lang => 'fr' + assert_response :redirect + assert_nil flash[:error] + assert IssueStatus.find_by_name('Nouveau') + end + + def test_test_email + get :test_email + assert_redirected_to '/settings/edit?tab=notifications' + mail = ActionMailer::Base.deliveries.last + assert_kind_of TMail::Mail, mail + user = User.find(1) + assert_equal [user.mail], mail.bcc + end + + def test_no_plugins + Redmine::Plugin.clear + + get :plugins + assert_response :success + assert_template 'plugins' + end + + def test_plugins + # Register a few plugins + Redmine::Plugin.register :foo do + name 'Foo plugin' + author 'John Smith' + description 'This is a test plugin' + version '0.0.1' + settings :default => {'sample_setting' => 'value', 'foo'=>'bar'}, :partial => 'foo/settings' + end + Redmine::Plugin.register :bar do + end + + get :plugins + assert_response :success + assert_template 'plugins' + + assert_tag :td, :child => { :tag => 'span', :content => 'Foo plugin' } + assert_tag :td, :child => { :tag => 'span', :content => 'Bar' } + end + + def test_info + get :info + assert_response :success + assert_template 'info' + end + + def test_admin_menu_plugin_extension + Redmine::MenuManager.map :admin_menu do |menu| + menu.push :test_admin_menu_plugin_extension, '/foo/bar', :caption => 'Test' + end + + get :index + assert_response :success + assert_tag :a, :attributes => { :href => '/foo/bar' }, + :content => 'Test' + + Redmine::MenuManager.map :admin_menu do |menu| + menu.delete :test_admin_menu_plugin_extension + end + end + + private + + def delete_configuration_data + Role.delete_all('builtin = 0') + Tracker.delete_all + IssueStatus.delete_all + Enumeration.delete_all + end +end diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/1f/1fcb69836707f0f2797567ced5c5da34d64949eb.svn-base --- /dev/null +++ b/.svn/pristine/1f/1fcb69836707f0f2797567ced5c5da34d64949eb.svn-base @@ -0,0 +1,58 @@ +<%= l(:label_no_data) %>
+<% else %> +| <%= check_box_tag 'ids[]', issue.id %> | +<%= link_to_issue(issue, :project => (@project != issue.project)) %> | +
<%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %>
+<% end %> + +<%= custom_field_tag_with_label :issue, value %>
+<% if i == split_on -%> +| + | |||||||
|---|---|---|---|---|---|---|---|
| <%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %> | +<%= h(user.firstname) %> | +<%= h(user.lastname) %> | +<%= mail_to(h(user.mail)) %> | +<%= checked_image user.admin? %> | +<%= format_time(user.created_on) %> | +<%= format_time(user.last_login_on) unless user.last_login_on.nil? %> | ++ <%= change_status_link(user) %> + <%= link_to(l(:button_delete), user, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') unless User.current == user %> + | +
<%= pagination_links_full @user_pages, @user_count %>
+ +<% html_title(l(:label_user_plural)) -%> diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/21/21e12c0e1e71e0c4f94a4c58d91a04399075123a.svn-base --- /dev/null +++ b/.svn/pristine/21/21e12c0e1e71e0c4f94a4c58d91a04399075123a.svn-base @@ -0,0 +1,21 @@ +# Settings specified here will take precedence over those in config/environment.rb + +# The production environment is meant for finished, "live" apps. +# Code is not reloaded between requests +config.cache_classes = true + +# Use a different logger for distributed setups +# config.logger = SyslogLogger.new +config.log_level = :info + +# Full error reports are disabled and caching is turned on +config.action_controller.consider_all_requests_local = false +config.action_controller.perform_caching = true + +# Enable serving of images, stylesheets, and javascripts from an asset server +# config.action_controller.asset_host = "http://assets.example.com" + +# Disable mail delivery +config.action_mailer.perform_deliveries = false +config.action_mailer.raise_delivery_errors = false + diff -r 487d96eac004 -r 5e80956cc792 .svn/pristine/21/21f67f445a6c5a2512b4712ac66209391d37efdc.svn-base --- /dev/null +++ b/.svn/pristine/21/21f67f445a6c5a2512b4712ac66209391d37efdc.svn-base @@ -0,0 +1,241 @@ +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require 'redmine/scm/adapters/abstract_adapter' +require 'rexml/document' + +module Redmine + module Scm + module Adapters + class DarcsAdapter < AbstractAdapter + # Darcs executable name + DARCS_BIN = Redmine::Configuration['scm_darcs_command'] || "darcs" + + class << self + def client_command + @@bin ||= DARCS_BIN + end + + def sq_bin + @@sq_bin ||= shell_quote_command + end + + def client_version + @@client_version ||= (darcs_binary_version || []) + end + + def client_available + !client_version.empty? + end + + def darcs_binary_version + darcsversion = darcs_binary_version_from_command_line.dup + if darcsversion.respond_to?(:force_encoding) + darcsversion.force_encoding('ASCII-8BIT') + end + if m = darcsversion.match(%r{\A(.*?)((\d+\.)+\d+)}) + m[2].scan(%r{\d+}).collect(&:to_i) + end + end + + def darcs_binary_version_from_command_line + shellout("#{sq_bin} --version") { |io| io.read }.to_s + end + end + + def initialize(url, root_url=nil, login=nil, password=nil, + path_encoding=nil) + @url = url + @root_url = url + end + + def supports_cat? + # cat supported in darcs 2.0.0 and higher + self.class.client_version_above?([2, 0, 0]) + end + + # Get info about the darcs repository + def info + rev = revisions(nil,nil,nil,{:limit => 1}) + rev ? Info.new({:root_url => @url, :lastrev => rev.last}) : nil + end + + # Returns an Entries collection + # or nil if the given path doesn't exist in the repository + def entries(path=nil, identifier=nil, options={}) + path_prefix = (path.blank? ? '' : "#{path}/") + if path.blank? + path = ( self.class.client_version_above?([2, 2, 0]) ? @url : '.' ) + end + entries = Entries.new + cmd = "#{self.class.sq_bin} annotate --repodir #{shell_quote @url} --xml-output" + cmd << " --match #{shell_quote("hash #{identifier}")}" if identifier + cmd << " #{shell_quote path}" + shellout(cmd) do |io| + begin + doc = REXML::Document.new(io) + if doc.root.name == 'directory' + doc.elements.each('directory/*') do |element| + next unless ['file', 'directory'].include? element.name + entries << entry_from_xml(element, path_prefix) + end + elsif doc.root.name == 'file' + entries << entry_from_xml(doc.root, path_prefix) + end + rescue + end + end + return nil if $? && $?.exitstatus != 0 + entries.compact.sort_by_name + end + + def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={}) + path = '.' if path.blank? + revisions = Revisions.new + cmd = "#{self.class.sq_bin} changes --repodir #{shell_quote @url} --xml-output" + cmd << " --from-match #{shell_quote("hash #{identifier_from}")}" if identifier_from + cmd << " --last #{options[:limit].to_i}" if options[:limit] + shellout(cmd) do |io| + begin + doc = REXML::Document.new(io) + doc.elements.each("changelog/patch") do |patch| + message = patch.elements['name'].text + message << "\n" + patch.elements['comment'].text.gsub(/\*\*\*END OF DESCRIPTION\*\*\*.*\z/m, '') if patch.elements['comment'] + revisions << Revision.new({:identifier => nil, + :author => patch.attributes['author'], + :scmid => patch.attributes['hash'], + :time => Time.parse(patch.attributes['local_date']), + :message => message, + :paths => (options[:with_path] ? get_paths_for_patch(patch.attributes['hash']) : nil) + }) + end + rescue + end + end + return nil if $? && $?.exitstatus != 0 + revisions + end + + def diff(path, identifier_from, identifier_to=nil) + path = '*' if path.blank? + cmd = "#{self.class.sq_bin} diff --repodir #{shell_quote @url}" + if identifier_to.nil? + cmd << " --match #{shell_quote("hash #{identifier_from}")}" + else + cmd << " --to-match #{shell_quote("hash #{identifier_from}")}" + cmd << " --from-match #{shell_quote("hash #{identifier_to}")}" + end + cmd << " -u #{shell_quote path}" + diff = [] + shellout(cmd) do |io| + io.each_line do |line| + diff << line + end + end + return nil if $? && $?.exitstatus != 0 + diff + end + + def cat(path, identifier=nil) + cmd = "#{self.class.sq_bin} show content --repodir #{shell_quote @url}" + cmd << " --match #{shell_quote("hash #{identifier}")}" if identifier + cmd << " #{shell_quote path}" + cat = nil + shellout(cmd) do |io| + io.binmode + cat = io.read + end + return nil if $? && $?.exitstatus != 0 + cat + end + + private + + # Returns an Entry from the given XML element + # or nil if the entry was deleted + def entry_from_xml(element, path_prefix) + modified_element = element.elements['modified'] + if modified_element.elements['modified_how'].text.match(/removed/) + return nil + end + + Entry.new({:name => element.attributes['name'], + :path => path_prefix + element.attributes['name'], + :kind => element.name == 'file' ? 'file' : 'dir', + :size => nil, + :lastrev => Revision.new({ + :identifier => nil, + :scmid => modified_element.elements['patch'].attributes['hash'] + }) + }) + end + + def get_paths_for_patch(hash) + paths = get_paths_for_patch_raw(hash) + if self.class.client_version_above?([2, 4]) + orig_paths = paths + paths = [] + add_paths = [] + add_paths_name = [] + mod_paths = [] + other_paths = [] + orig_paths.each do |path| + if path[:action] == 'A' + add_paths << path + add_paths_name << path[:path] + elsif path[:action] == 'M' + mod_paths << path + else + other_paths << path + end + end + add_paths_name.each do |add_path| + mod_paths.delete_if { |m| m[:path] == add_path } + end + paths.concat add_paths + paths.concat mod_paths + paths.concat other_paths + end + paths + end + + # Retrieve changed paths for a single patch + def get_paths_for_patch_raw(hash) + cmd = "#{self.class.sq_bin} annotate --repodir #{shell_quote @url} --summary --xml-output" + cmd << " --match #{shell_quote("hash #{hash}")} " + paths = [] + shellout(cmd) do |io| + begin + # Darcs xml output has multiple root elements in this case (tested with darcs 1.0.7) + # A root element is added so that REXML doesn't raise an error + doc = REXML::Document.new("| <%= l(:field_comments) %> | +<%= sort_header_tag('hours', :caption => l(:field_hours)) %> ++ | ||||||
|---|---|---|---|---|---|---|---|
| <%= format_date(entry.spent_on) %> | +<%= link_to_user(entry.user) %> | +<%=h entry.activity %> | +<%= link_to_project(entry.project) %> | ++<% if entry.issue -%> +<%= entry.issue.visible? ? link_to_issue(entry.issue, :truncate => 50) : "##{entry.issue.id}" -%> +<% end -%> + | +<%=h entry.comments %> | +<%= html_hours("%.2f" % entry.hours) %> | ++<% if entry.editable_by?(User.current) -%> + <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry, :project_id => nil}, + :title => l(:button_edit) %> + <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry, :project_id => nil}, + :confirm => l(:text_are_you_sure), + :method => :delete, + :title => l(:button_delete) %> +<% end -%> + | +
<%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
+ :author => h(@wiki_content.author)) %>
+<%=h @wiki_content.comments %>
<%= f.text_field :title, :required => true, :size => 100 %>
+<%= f.check_box :redirect_existing_links %>
+<%= f.select :parent_id, "" + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent), :label => :field_parent_title %>
+<%= l(:label_no_data) %>
<% end %> + +<% @grouped.keys.sort.each do |group| %> +