tagged version 2.1.4

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/tags/2.1.4@10876 e93f8b46-1217-0410-a6f0-8f06a7374b81

Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.2.11'
+gem 'rails', '3.2.8'
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
 gem "coderay", "~> 1.0.6"

app/controllers/previews_controller.rb

@@ -26,8 +26,7 @@ class PreviewsController < ApplicationController
       if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
         @description = nil
       end
-      # params[:notes] is useful for preview of notes in issue history
+      @notes = params[:notes]
-      @notes = params[:notes] || (params[:issue] ? params[:issue][:notes] : nil)
     else
       @description = (params[:issue] ? params[:issue][:description] : nil)
     end

app/controllers/wiki_controller.rb

@@ -129,6 +129,15 @@ class WikiController < ApplicationController
     # don't keep previous comment
     @content.comments = nil
 
+    if !@page.new_record? && params[:content].present? && @content.text == params[:content][:text]
+      attachments = Attachment.attach_files(@page, params[:attachments])
+      render_attachment_warning_if_needed(@page)
+      # don't save content if text wasn't changed
+      @page.save
+      redirect_to :action => 'show', :project_id => @project, :id => @page.title
+      return
+    end
+
     @content.comments = params[:content][:comments]
     @text = params[:content][:text]
     if params[:section].present? && Redmine::WikiFormatting.supports_section_edit?
@@ -140,8 +149,8 @@ class WikiController < ApplicationController
       @content.text = @text
     end
     @content.author = User.current
-
+    @page.content = @content
-    if @page.save_with_content
+    if @page.save
       attachments = Attachment.attach_files(@page, params[:attachments])
       render_attachment_warning_if_needed(@page)
       call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})

app/models/custom_field.rb

@@ -130,13 +130,7 @@ class CustomField < ActiveRecord::Base
     possible_values_options = possible_values_options(customized)
     if possible_values_options.present?
       keyword = keyword.to_s.downcase
-      if v = possible_values_options.detect {|text, id| text.downcase == keyword}
+      possible_values_options.detect {|text, id| text.downcase == keyword}.try(:last)
-        if v.is_a?(Array)
-          v.last
-        else
-          v
-        end
-      end
     else
       keyword
     end

app/models/wiki_page.rb

@@ -172,21 +172,6 @@ class WikiPage < ActiveRecord::Base
     self.parent = parent_page
   end
 
-  # Saves the page and its content if text was changed
-  def save_with_content
-    ret = nil
-    transaction do
-      if new_record?
-        # Rails automatically saves associated content
-        ret = save
-      else
-        ret = save && (content.text_changed? ? content.save : true)
-      end
-      raise ActiveRecord::Rollback unless ret
-    end
-    ret
-  end
-
   protected
 
   def validate_parent_title

app/views/journals/edit.js.erb

@@ -1,8 +1,2 @@
 $("#journal-<%= @journal.id %>-notes").hide();
-
+$("#journal-<%= @journal.id %>-notes").after('<%= escape_javascript(render :partial => 'notes_form') %>');
-if ($("form#journal-<%= @journal.id %>-form").length > 0) {
-  // journal edit form already loaded
-  $("#journal-<%= @journal.id %>-form").show();
-} else {
-  $("#journal-<%= @journal.id %>-notes").after('<%= escape_javascript(render :partial => 'notes_form') %>');
-}

config/locales/nl.yml

@@ -49,7 +49,7 @@ nl:
         one:   "ongeveer 1 uur"
         other: "ongeveer %{count} uren"
       x_hours:
-        one:   "1 uur"
+        one:   "1 hour"
         other: "%{count} hours"
       x_days:
         one:   "1 dag"
@@ -990,58 +990,58 @@ nl:
   description_all_columns: Alle kolommen
   button_export: Exporteren
   label_export_options: "%{export_format} export opties"
-  error_attachment_too_big: Dit bestand kan niet worden geupload omdat het de maximaal toegestane grootte overschrijd (%{max_size})
+  error_attachment_too_big: This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})
-  notice_failed_to_save_time_entries: "Opslaan gefaald voor %{count} tijdsnotatie(s) van %{total} geselecteerde: %{ids}."
+  notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
   label_x_issues:
-    zero:  0 incidenten
+    zero:  0 issue
-    one:   1 incidenten
+    one:   1 issue
-    other: "%{count} incidenten"
+    other: "%{count} issues"
-  label_repository_new: Nieuw repository
+  label_repository_new: New repository
-  field_repository_is_default: Hoofd repository
+  field_repository_is_default: Main repository
-  label_copy_attachments: Copieer bijlage(n)
+  label_copy_attachments: Copy attachments
   label_item_position: "%{position}/%{count}"
-  label_completed_versions: Versies compleet
+  label_completed_versions: Completed versions
-  field_multiple: Meerdere waardes
+  field_multiple: Multiple values
-  setting_commit_cross_project_ref: Sta toe om incidenten van alle projecten te refereren en oplossen
+  setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed
-  text_issue_conflict_resolution_add_notes: Voeg mijn notities toe en annuleer andere wijzigingen
+  text_issue_conflict_resolution_add_notes: Add my notes and discard my other changes
-  text_issue_conflict_resolution_overwrite: Voeg mijn wijzigingen alsnog toe (voorgaande notities worden bewaard, maar sommige kunnen overschreden worden)
+  text_issue_conflict_resolution_overwrite: Apply my changes anyway (previous notes will be kept but some changes may be overwritten)
-  notice_issue_update_conflict: Dit incident is reeds geupdate door een andere gebruiker terwijl jij bezig was
+  notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
-  text_issue_conflict_resolution_cancel: Annuleer mijn wijzigingen en geef pagina opnieuw weer %{link}
+  text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
-  permission_manage_related_issues: Beheer gerelateerde incidenten
+  permission_manage_related_issues: Manage related issues
   field_auth_source_ldap_filter: LDAP filter
-  label_search_for_watchers: Zoek om monitoorders toe te voegen
+  label_search_for_watchers: Search for watchers to add
-  notice_account_deleted: Uw account is permanent verwijderd
+  notice_account_deleted: Your account has been permanently deleted.
-  setting_unsubscribe: Sta gebruikers toe hun eigen account te verwijderen
+  setting_unsubscribe: Allow users to delete their own account
-  button_delete_my_account: Verwijder mijn account
+  button_delete_my_account: Delete my account
   text_account_destroy_confirmation: |-
-    Weet u zeker dat u door wilt gaan?
+    Are you sure you want to proceed?
-    Uw account wordt permanent verwijderd zonder mogelijkheid deze te heractiveren.
+    Your account will be permanently deleted, with no way to reactivate it.
-  error_session_expired: Uw sessie is verlopen. U dient opnieuw in te loggen.
+  error_session_expired: Your session has expired. Please login again.
-  text_session_expiration_settings: "Waarschuwing: door deze instelling te wijzigen kan sessies laten verlopen inclusief de uwe"
+  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
-  setting_session_lifetime: Maximale sessieduur
+  setting_session_lifetime: Session maximum lifetime
-  setting_session_timeout: Sessie inactiviteit timeout
+  setting_session_timeout: Session inactivity timeout
-  label_session_expiration: Sessie verlopen
+  label_session_expiration: Session expiration
-  permission_close_project: Sluit / heropen project
+  permission_close_project: Close / reopen the project
-  label_show_closed_projects: Gesloten projecten weergeven
+  label_show_closed_projects: View closed projects
-  button_close: Sluiten
+  button_close: Close
-  button_reopen: Heropen
+  button_reopen: Reopen
-  project_status_active: actief
+  project_status_active: active
-  project_status_closed: gesloten
+  project_status_closed: closed
-  project_status_archived: gearchiveerd
+  project_status_archived: archived
-  text_project_closed: Dit project is gesloten en op alleen-lezen
+  text_project_closed: This project is closed and read-only.
-  notice_user_successful_create: Gebruiker %{id} aangemaakt.
+  notice_user_successful_create: User %{id} created.
-  field_core_fields: Standaard verleden
+  field_core_fields: Standard fields
   field_timeout: Timeout (in seconds)
-  setting_thumbnails_enabled: Geef bijlage miniaturen weer
+  setting_thumbnails_enabled: Display attachment thumbnails
-  setting_thumbnails_size: Grootte miniaturen (in pixels)
+  setting_thumbnails_size: Thumbnails size (in pixels)
-  label_status_transitions: Status transitie
+  label_status_transitions: Status transitions
-  label_fields_permissions: Permissie velden
+  label_fields_permissions: Fields permissions
-  label_readonly: Alleen-lezen
+  label_readonly: Read-only
-  label_required: Verplicht
+  label_required: Required
   text_repository_identifier_info: 'Alleen kleine letter (a-z), cijfers, streepjes en liggende streepjes zijn toegestaan.<br />Eenmaal opgeslagen kan de identifier niet worden gewijzigd.'
-  field_board_parent: Hoofd forum
+  field_board_parent: Parent forum
-  label_attribute_of_project: Project %{name}
+  label_attribute_of_project: Project's %{name}
-  label_attribute_of_author: Auteur(s) %{name}
+  label_attribute_of_author: Author's %{name}
-  label_attribute_of_assigned_to: Toegewezen %{name}
+  label_attribute_of_assigned_to: Assignee's %{name}
-  label_attribute_of_fixed_version: Target versions %{name}
+  label_attribute_of_fixed_version: Target version's %{name}
-  label_copy_subtasks: Kopieer subtaken
+  label_copy_subtasks: Copy subtasks

config/locales/no.yml

@@ -971,64 +971,64 @@
   setting_issue_group_assignment: Tillat tildeling av saker til grupper
   label_diff: diff
 
-  description_query_sort_criteria_direction: Sorteringsretning
+  description_query_sort_criteria_direction: Sort direction
   description_project_scope: Search scope
   description_filter: Filter
   description_user_mail_notification: Mail notification settings
-  description_date_from: Oppgi startdato
+  description_date_from: Enter start date
-  description_message_content: Meldingsinnhold
+  description_message_content: Message content
-  description_available_columns: Tilgjengelige kolonner
+  description_available_columns: Available Columns
-  description_date_range_interval: Velg datointervall ved å spesifisere start- og sluttdato
+  description_date_range_interval: Choose range by selecting start and end date
   description_issue_category_reassign: Choose issue category
-  description_search: Søkefelt
+  description_search: Searchfield
   description_notes: Notes
   description_date_range_list: Choose range from list
-  description_choose_project: Prosjekter
+  description_choose_project: Projects
-  description_date_to: Oppgi sluttdato
+  description_date_to: Enter end date
   description_query_sort_criteria_attribute: Sort attribute
-  description_wiki_subpages_reassign: Velg ny overordnet side
+  description_wiki_subpages_reassign: Choose new parent page
-  description_selected_columns: Valgte kolonner
+  description_selected_columns: Selected Columns
-  label_parent_revision: Overordnet
+  label_parent_revision: Parent
-  label_child_revision: Underordnet
+  label_child_revision: Child
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
-  setting_default_issue_start_date_to_creation_date: Bruk dagens dato som startdato for nye saker
+  setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
-  button_edit_section: Rediger denne seksjonen
+  button_edit_section: Edit this section
   setting_repositories_encodings: Attachments and repositories encodings
-  description_all_columns: Alle kolonnene
+  description_all_columns: All Columns
-  button_export: Eksporter
+  button_export: Export
-  label_export_options: "%{export_format} eksportvalg"
+  label_export_options: "%{export_format} export options"
-  error_attachment_too_big: Filen overstiger maksimum filstørrelse (%{max_size}) og kan derfor ikke lastes opp
+  error_attachment_too_big: This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})
   notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
   label_x_issues:
     zero:  0 sak
     one:   1 sak
     other: "%{count} saker"
-  label_repository_new: Nytt depot
+  label_repository_new: New repository
-  field_repository_is_default: Hoveddepot
+  field_repository_is_default: Main repository
-  label_copy_attachments: Kopier vedlegg
+  label_copy_attachments: Copy attachments
   label_item_position: "%{position}/%{count}"
   label_completed_versions: Completed versions
-  text_project_identifier_info: Kun små bokstaver (a-z), tall, bindestrek (-) og "underscore" (_) er tillatt.<br />Etter lagring er det ikke mulig å gjøre endringer.
+  text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
-  field_multiple: Flere verdier
+  field_multiple: Multiple values
   setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed
   text_issue_conflict_resolution_add_notes: Add my notes and discard my other changes
   text_issue_conflict_resolution_overwrite: Apply my changes anyway (previous notes will be kept but some changes may be overwritten)
-  notice_issue_update_conflict: Saken ble oppdatert av en annen bruker mens du redigerte den.
+  notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
-  text_issue_conflict_resolution_cancel: Forkast alle endringen mine og vis %{link} på nytt
+  text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
   permission_manage_related_issues: Manage related issues
   field_auth_source_ldap_filter: LDAP filter
   label_search_for_watchers: Search for watchers to add
-  notice_account_deleted: Din konto er ugjenkallelig slettet.
+  notice_account_deleted: Your account has been permanently deleted.
-  setting_unsubscribe: Tillat brukere å slette sin egen konto
+  setting_unsubscribe: Allow users to delete their own account
-  button_delete_my_account: Slett kontoen min
+  button_delete_my_account: Delete my account
   text_account_destroy_confirmation: |-
-    Er du sikker på at du ønsker å fortsette?
+    Are you sure you want to proceed?
-    Kontoen din vil bli ugjenkallelig slettet uten mulighet for å reaktiveres igjen.
+    Your account will be permanently deleted, with no way to reactivate it.
-  error_session_expired: Økten har gått ut på tid. Vennligst logg på igjen.
+  error_session_expired: Your session has expired. Please login again.
-  text_session_expiration_settings: "Advarsel: ved å endre disse innstillingene kan aktive økter gå ut på tid, inkludert din egen."
+  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
-  setting_session_lifetime: Øktenes makslengde
+  setting_session_lifetime: Session maximum lifetime
-  setting_session_timeout: Økten er avsluttet på grunn av inaktivitet
+  setting_session_timeout: Session inactivity timeout
-  label_session_expiration: Økten er avsluttet
+  label_session_expiration: Session expiration
   permission_close_project: Close / reopen the project
   label_show_closed_projects: View closed projects
   button_close: Close

config/locales/ru.yml

@@ -1121,7 +1121,7 @@ ru:
   button_export: Экспорт
   label_export_options: "%{export_format} параметры экспорта"
   error_attachment_too_big: Этот файл нельзя загрузить из-за превышения максимального размера файла (%{max_size})
-  notice_failed_to_save_time_entries: "Невозможно сохранить %{count} затраченное время для %{total} выбранных: %{ids}."
+  notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
   label_x_issues:
     zero:  0 Задач
     one:   1 Задача
@@ -1147,11 +1147,11 @@ ru:
   setting_unsubscribe: "Разрешить пользователям удалять свои учетные записи" 
   button_delete_my_account: "Удалить мою учетную запись" 
   text_account_destroy_confirmation: "Ваша учетная запись будет полностью удалена без возможности восстановления.\nВы уверены, что хотите продолжить?" 
-  error_session_expired: Срок вашей сессии истек. Пожалуйста войдите еще раз
+  error_session_expired: Your session has expired. Please login again.
   text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
-  setting_session_lifetime: Максимальная продолжительность сессии
+  setting_session_lifetime: Session maximum lifetime
-  setting_session_timeout: Таймут сессии 
+  setting_session_timeout: Session inactivity timeout
-  label_session_expiration: Срок истечения сессии
+  label_session_expiration: Session expiration
   permission_close_project: Закрывать / открывать проекты
   label_show_closed_projects: Просматривать закрытые проекты
   button_close: Сделать закрытым
@@ -1162,17 +1162,17 @@ ru:
   text_project_closed: Проект закрыт и находиться в режиме только для чтения.
   notice_user_successful_create: Пользователь %{id} создан.
   field_core_fields: Стандартные поля
-  field_timeout: Таймаут (в секундах)
+  field_timeout: Timeout (in seconds)
-  setting_thumbnails_enabled: Отображать превью для приложений
+  setting_thumbnails_enabled: Display attachment thumbnails
-  setting_thumbnails_size: Размер первью (в пикселях)
+  setting_thumbnails_size: Thumbnails size (in pixels)
   label_status_transitions: Статус-переходы
   label_fields_permissions: Права на изменения полей
   label_readonly: Не изменяется
   label_required: Обязательное
   text_repository_identifier_info: Допускаются только строчные латинские буквы (a-z), цифры, тире и подчеркивания.<br />После сохранения идентификатор изменить нельзя.
   field_board_parent: Родительский форум
-  label_attribute_of_project: Проект %{name}
+  label_attribute_of_project: Project's %{name}
   label_attribute_of_author: Имя автора %{name}
-  label_attribute_of_assigned_to: Назначена %{name}
+  label_attribute_of_assigned_to: Assignee's %{name}
-  label_attribute_of_fixed_version: Версия %{name}
+  label_attribute_of_fixed_version: Target version's %{name}
   label_copy_subtasks: Копировать подзадачи

doc/CHANGELOG

@@ -4,21 +4,6 @@ Redmine - project management software
 Copyright (C) 2006-2012  Jean-Philippe Lang
 http://www.redmine.org/
 
-== 2013-01-09 v2.1.6
-
-* Upgrade to Rails 3.2.11
-
-== 2012-12-18 v2.1.5
-
-* Defect #12400: Validation fails when receiving an email with list custom fields
-* Defect #12451: Macros.rb extract_macro_options should use lazy search
-* Defect #12513: Grouping of issues by custom fields not correct in PDF export
-* Defect #12566: Issue history notes previews are broken
-* Defect #12568: Clicking "edit" on a journal multiple times shows multiple forms
-* Patch #12605: Norwegian translation for 1.4-stable update
-* Patch #12614: Dutch translation
-* Patch #12615: Russian translation
-
 == 2012-11-24 v2.1.4
 
 * Defect #12274: Wiki export from Index by title is truncated

lib/redmine/export/pdf.rb

@@ -422,7 +422,7 @@ module Redmine
           if query.grouped? &&
                (group = query.group_by_column.value(issue)) != previous_group
             pdf.SetFontStyle('B',10)
-            group_label = group.blank? ? 'None' : group.to_s.dup
+            group_label = group.blank? ? 'None' : group.to_s
             group_label << " (#{query.issue_count_by_group[group]})"
             pdf.Bookmark group_label, 0, -1
             pdf.RDMCell(table_width + col_id_width, row_height * 2, group_label, 1, 1, 'L')

lib/redmine/version.rb

@@ -4,7 +4,7 @@ module Redmine
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY  = 6
+    TINY  = 4
 
     # Branch values:
     # * official release: nil

lib/redmine/wiki_formatting/macros.rb

@@ -48,7 +48,7 @@ module Redmine
 
         def extract_macro_options(args, *keys)
           options = {}
-          while args.last.to_s.strip =~ %r{^(.+?)\=(.+)$} && keys.include?($1.downcase.to_sym)
+          while args.last.to_s.strip =~ %r{^(.+)\=(.+)$} && keys.include?($1.downcase.to_sym)
             options[$1.downcase.to_sym] = $2
             args.pop
           end

test/fixtures/mail_handler/ticket_with_custom_fields.eml

@@ -39,4 +39,3 @@ pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.
 
 category: Stock management
 searchable field: Value for a custom field
-Database:  postgresql

test/unit/custom_field_test.rb

@@ -212,9 +212,4 @@ class CustomFieldTest < ActiveSupport::TestCase
     assert_nil CustomField.new(:field_format => 'text').value_class
     assert_nil CustomField.new.value_class
   end
-
-  def test_value_from_keyword_for_list_custom_field
-    field = CustomField.find(1)
-    assert_equal 'PostgreSQL', field.value_from_keyword('postgresql', Issue.find(1))
-  end
 end

test/unit/lib/redmine/wiki_formatting/macros_test.rb

@@ -100,25 +100,6 @@ class Redmine::WikiFormatting::MacrosTest < ActionView::TestCase
     assert_equal '<p>Hello world! Object: Issue, Called with no argument and no block of text.</p>', textilizable(text, :object => Issue.find(1))
   end
 
-  def test_extract_macro_options_should_with_args
-    options = extract_macro_options(["arg1", "arg2"], :foo, :size)
-    assert_equal([["arg1", "arg2"], {}], options)
-  end
-
-  def test_extract_macro_options_should_with_options
-    options = extract_macro_options(["foo=bar", "size=2"], :foo, :size)
-    assert_equal([[], {:foo => "bar", :size => "2"}], options)
-  end
-
-  def test_extract_macro_options_should_with_args_and_options
-    options = extract_macro_options(["arg1", "arg2", "foo=bar", "size=2"], :foo, :size)
-    assert_equal([["arg1", "arg2"], {:foo => "bar", :size => "2"}], options)
-  end
-
-  def test_extract_macro_options_should_parse_options_lazily
-    options = extract_macro_options(["params=x=1&y=2"], :params)
-    assert_equal([[], {:params => "x=1&y=2"}], options)
-  end
 
   def test_macro_exception_should_be_displayed
     Redmine::WikiFormatting::Macros.macro :exception do |obj, args|

test/unit/mail_handler_test.rb

@@ -177,8 +177,8 @@ class MailHandlerTest < ActiveSupport::TestCase
     assert !issue.new_record?
     issue.reload
     assert_equal 'New ticket with custom field values', issue.subject
-    assert_equal 'PostgreSQL', issue.custom_field_value(1)
+    assert_equal 'Value for a custom field',
-    assert_equal 'Value for a custom field', issue.custom_field_value(2)
+                 issue.custom_value_for(CustomField.find_by_name('Searchable field')).value
     assert !issue.description.match(/^searchable field:/i)
   end