From c66943c9b893483883e7c18e55aea7587f9f7bbd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Dec 2009 15:23:22 +0000
Subject: [PATCH] Removes changelog view. All trackers can now be displayed on
 the roadmap. By default, only those marked as displayed on the roadmap are
 displayed.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3162 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb      | 35 ++-------------
 app/views/issues/_sidebar.rhtml             |  1 -
 app/views/projects/changelog.rhtml          | 47 ---------------------
 app/views/trackers/_form.rhtml              |  1 -
 config/locales/bg.yml                       |  2 -
 config/locales/bs.yml                       |  2 -
 config/locales/ca.yml                       |  2 -
 config/locales/cs.yml                       |  2 -
 config/locales/da.yml                       |  2 -
 config/locales/de.yml                       |  2 -
 config/locales/el.yml                       |  2 -
 config/locales/en.yml                       |  2 -
 config/locales/es.yml                       |  2 -
 config/locales/fi.yml                       |  2 -
 config/locales/fr.yml                       |  2 -
 config/locales/gl.yml                       |  2 -
 config/locales/he.yml                       |  2 -
 config/locales/hu.yml                       |  2 -
 config/locales/it.yml                       |  2 -
 config/locales/ja.yml                       |  2 -
 config/locales/ko.yml                       |  2 -
 config/locales/lt.yml                       |  2 -
 config/locales/nl.yml                       |  2 -
 config/locales/no.yml                       |  2 -
 config/locales/pl.yml                       |  2 -
 config/locales/pt-BR.yml                    |  2 -
 config/locales/pt.yml                       |  2 -
 config/locales/ro.yml                       |  2 -
 config/locales/ru.yml                       |  2 -
 config/locales/sk.yml                       |  2 -
 config/locales/sl.yml                       |  2 -
 config/locales/sr.yml                       |  2 -
 config/locales/sv.yml                       |  2 -
 config/locales/th.yml                       |  2 -
 config/locales/tr.yml                       |  2 -
 config/locales/uk.yml                       |  2 -
 config/locales/vi.yml                       |  2 -
 config/locales/zh-TW.yml                    |  2 -
 config/locales/zh.yml                       |  2 -
 config/routes.rb                            |  2 +-
 lib/redmine.rb                              |  2 +-
 test/functional/projects_controller_test.rb | 23 ----------
 42 files changed, 6 insertions(+), 175 deletions(-)
 delete mode 100644 app/views/projects/changelog.rhtml

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 8df4e33576..ad7ec8ef32 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -21,7 +21,6 @@ class ProjectsController < ApplicationController
   menu_item :roadmap, :only => :roadmap
   menu_item :files, :only => [:list_files, :add_file]
   menu_item :settings, :only => :settings
-  menu_item :issues, :only => [:changelog]
   
   before_filter :find_project, :except => [ :index, :list, :add, :copy, :activity ]
   before_filter :find_optional_project, :only => :activity
@@ -302,36 +301,10 @@ class ProjectsController < ApplicationController
     @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
     render :layout => !request.xhr?
   end
-  
-  # Show changelog for @project
-  def changelog
-    @trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
-    retrieve_selected_tracker_ids(@trackers)
-    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
-    project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
-    
-    @versions = @project.shared_versions.sort
-    
-    @issues_by_version = {}
-    unless @selected_tracker_ids.empty?
-      @versions.each do |version|
-        conditions = {:tracker_id => @selected_tracker_ids, "#{IssueStatus.table_name}.is_closed" => true}
-        if !@project.versions.include?(version)
-          conditions.merge!(:project_id => project_ids)
-        end
-        issues = version.fixed_issues.visible.find(:all,
-                                                   :include => [:status, :tracker, :priority],
-                                                   :conditions => conditions,
-                                                   :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id")
-        @issues_by_version[version] = issues
-      end
-    end
-    @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].empty?}
-  end
 
   def roadmap
-    @trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
-    retrieve_selected_tracker_ids(@trackers)
+    @trackers = @project.trackers.find(:all, :order => 'position')
+    retrieve_selected_tracker_ids(@trackers, @trackers.select {|t| t.is_in_roadmap?})
     @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
     project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
     
@@ -415,11 +388,11 @@ private
     render_404
   end
 
-  def retrieve_selected_tracker_ids(selectable_trackers)
+  def retrieve_selected_tracker_ids(selectable_trackers, default_trackers=nil)
     if ids = params[:tracker_ids]
       @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
     else
-      @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
+      @selected_tracker_ids = (default_trackers || selectable_trackers).collect {|t| t.id.to_s }
     end
   end
 end
diff --git a/app/views/issues/_sidebar.rhtml b/app/views/issues/_sidebar.rhtml
index de0c538fb8..076091fbd5 100644
--- a/app/views/issues/_sidebar.rhtml
+++ b/app/views/issues/_sidebar.rhtml
@@ -2,7 +2,6 @@
 <%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />
 <% if @project %>
 <%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
-<%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %><br />
 <% end %>
 <%= call_hook(:view_issues_sidebar_issues_bottom) %>
 
diff --git a/app/views/projects/changelog.rhtml b/app/views/projects/changelog.rhtml
deleted file mode 100644
index 0779e069f4..0000000000
--- a/app/views/projects/changelog.rhtml
+++ /dev/null
@@ -1,47 +0,0 @@
-<h2><%=l(:label_change_log)%></h2>
-
-<% if @versions.empty? %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
-
-<% @versions.each do |version| %>   
-    <%= tag 'a', :name => version.name %>
-    <h3 class="icon22 icon22-package"><%= link_to_version version %></h3>
-    <% if version.effective_date %>
-      <p><%= format_date(version.effective_date) %></p>
-    <% end %>
-    <p><%=h version.description %></p>
-    <% issues = version.fixed_issues.visible.find(:all,
-         :include => [:status, :tracker, :priority],
-         :conditions => ["#{Issue.table_name}.project_id = ? AND #{IssueStatus.table_name}.is_closed=? AND #{Issue.table_name}.tracker_id in (?)", @project.id, true, @selected_tracker_ids],
-         :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
-       issues ||= []
-    %>
-    <% if !issues.empty? %>
-    <ul>
-      <% issues.each do |issue| %>
-        <li><%= link_to_issue(issue) %></li>
-      <% end %>
-    </ul>
-    <% end %>
-<% end %>
-
-<% content_for :sidebar do %>
-<% form_tag({},:method => :get) do %>
-<h3><%= l(:label_change_log) %></h3>
-<% @trackers.each do |tracker| %>
-  <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
-  <%= tracker.name %></label><br />
-<% end %>
-<% if @project.descendants.active.any? %>
-	<%= hidden_field_tag 'with_subprojects', 0 %>
-  <br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
-<% end %>
-<p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
-<% end %>
-
-<h3><%= l(:label_version_plural) %></h3>
-<% @versions.each do |version| %>
-<%= link_to format_version_name(version), :anchor => version.name %><br />
-<% end %>
-<% end %>
diff --git a/app/views/trackers/_form.rhtml b/app/views/trackers/_form.rhtml
index 870c53f510..2cbed576cd 100644
--- a/app/views/trackers/_form.rhtml
+++ b/app/views/trackers/_form.rhtml
@@ -4,7 +4,6 @@
 <div class="box tabular">
 <!--[form:tracker]-->
 <p><%= f.text_field :name, :required => true %></p>
-<p><%= f.check_box :is_in_chlog %></p>
 <p><%= f.check_box :is_in_roadmap %></p>
 
 <% if IssueCustomField.all.any? %>
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index e454f4b714..07dfe794f0 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -192,7 +192,6 @@ bg:
   field_homepage: Начална страница
   field_is_public: Публичен
   field_parent: Подпроект на
-  field_is_in_chlog: Да се вижда ли в Изменения
   field_is_in_roadmap: Да се вижда ли в Пътна карта
   field_login: Потребител
   field_mail_notification: Известия по пощата
@@ -347,7 +346,6 @@ bg:
   label_news_plural: Новини
   label_news_latest: Последни новини
   label_news_view_all: Виж всички
-  label_change_log: Изменения
   label_settings: Настройки
   label_overview: Общ изглед
   label_version: Версия
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 94bec2d1f4..9bf78abf24 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -226,7 +226,6 @@ bs:
   field_homepage: Naslovna strana
   field_is_public: Javni
   field_parent: Podprojekt od
-  field_is_in_chlog: Aktivnosti prikazane u logu promjena
   field_is_in_roadmap: Aktivnosti prikazane u planu realizacije
   field_login: Prijava
   field_mail_notification: Email notifikacije
@@ -483,7 +482,6 @@ bs:
   label_news_latest: Posljednje novosti
   label_news_view_all: Pogledaj sve novosti
   label_news_added: Novosti su dodane
-  label_change_log: Log promjena
   label_settings: Postavke
   label_overview: Pregled
   label_version: Verzija
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index b5f69bbaef..77cd1fce10 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -208,7 +208,6 @@ ca:
   field_homepage: Pàgina web
   field_is_public: Públic
   field_parent: Subprojecte de
-  field_is_in_chlog: Assumptes mostrats en el registre de canvis
   field_is_in_roadmap: Assumptes mostrats en la planificació
   field_login: Entrada
   field_mail_notification: Notificacions per correu electrònic
@@ -463,7 +462,6 @@ ca:
   label_news_latest: Últimes noticies
   label_news_view_all: Visualitza totes les noticies
   label_news_added: Noticies afegides
-  label_change_log: Registre de canvis
   label_settings: Paràmetres
   label_overview: Resum
   label_version: Versió
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 703612fa62..095e412365 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -207,7 +207,6 @@ cs:
   field_homepage: Homepage
   field_is_public: Veřejný
   field_parent: Nadřazený projekt
-  field_is_in_chlog: Úkoly zobrazené v změnovém logu
   field_is_in_roadmap: Úkoly zobrazené v plánu
   field_login: Přihlášení
   field_mail_notification: Emailová oznámení
@@ -394,7 +393,6 @@ cs:
   label_news_latest: Poslední novinky
   label_news_view_all: Zobrazit všechny novinky
   label_news_added: Novinka přidána
-  label_change_log: Protokol změn
   label_settings: Nastavení
   label_overview: Přehled
   label_version: Verze
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 1167f44733..6fbfd0f577 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -224,7 +224,6 @@ da:
   field_homepage: Hjemmeside
   field_is_public: Offentlig
   field_parent: Underprojekt af
-  field_is_in_chlog: Sager vist i ændringer
   field_is_in_roadmap: Sager vist i roadmap
   field_login: Login
   field_mail_notification: Email-påmindelser
@@ -405,7 +404,6 @@ da:
   label_news_latest: Seneste nyheder
   label_news_view_all: Vis alle nyheder
   label_news_added: Nyhed tilføjet
-  label_change_log: Ændringer
   label_settings: Indstillinger
   label_overview: Oversigt
   label_version: Udgave
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 08fd0b0ea5..7db4cf469a 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -231,7 +231,6 @@ de:
   field_homepage: Projekt-Homepage
   field_is_public: Öffentlich
   field_parent: Unterprojekt von
-  field_is_in_chlog: Im Change-Log anzeigen
   field_is_in_roadmap: In der Roadmap anzeigen
   field_login: Mitgliedsname
   field_mail_notification: Mailbenachrichtigung
@@ -478,7 +477,6 @@ de:
   label_news_latest: Letzte News
   label_news_view_all: Alle News anzeigen
   label_news_added: News hinzugefügt
-  label_change_log: Change-Log
   label_settings: Konfiguration
   label_overview: Übersicht
   label_version: Version
diff --git a/config/locales/el.yml b/config/locales/el.yml
index f3efad8110..32129deb1f 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -217,7 +217,6 @@ el:
   field_homepage: Αρχική σελίδα
   field_is_public: Δημόσιο
   field_parent: Επιμέρους έργο του
-  field_is_in_chlog: Προβολή θεμάτων στο ιστορικό αλλαγών
   field_is_in_roadmap: Προβολή θεμάτων στο χάρτη πορείας
   field_login: Όνομα χρήστη
   field_mail_notification: Ειδοποιήσεις email
@@ -476,7 +475,6 @@ el:
   label_news_latest: Τελευταία νέα
   label_news_view_all: Προβολή όλων των νέων
   label_news_added: Τα νέα προστέθηκαν
-  label_change_log: Αλλαγή ιστορικού
   label_settings: Ρυθμίσεις
   label_overview: Επισκόπηση
   label_version: Έκδοση
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 795d2de9a2..6491af515d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -221,7 +221,6 @@ en:
   field_homepage: Homepage
   field_is_public: Public
   field_parent: Subproject of
-  field_is_in_chlog: Issues displayed in changelog
   field_is_in_roadmap: Issues displayed in roadmap
   field_login: Login
   field_mail_notification: Email notifications
@@ -488,7 +487,6 @@ en:
   label_news_latest: Latest news
   label_news_view_all: View all news
   label_news_added: News added
-  label_change_log: Change log
   label_settings: Settings
   label_overview: Overview
   label_version: Version
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 7601c9bfad..2775ae77e1 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -276,7 +276,6 @@ es:
   field_is_default: Estado por defecto
   field_is_filter: Usado como filtro
   field_is_for_all: Para todos los proyectos
-  field_is_in_chlog: Consultar las peticiones en el histórico
   field_is_in_roadmap: Consultar las peticiones en la planificación
   field_is_public: Público
   field_is_required: Obligatorio
@@ -368,7 +367,6 @@ es:
   label_browse: Hojear
   label_bulk_edit_selected_issues: Editar las peticiones seleccionadas
   label_calendar: Calendario
-  label_change_log: Cambios
   label_change_plural: Cambios
   label_change_properties: Cambiar propiedades
   label_change_status: Cambiar el estado
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 3052c66b27..89dcdb6f8c 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -237,7 +237,6 @@ fi:
   field_homepage: Kotisivu
   field_is_public: Julkinen
   field_parent: Aliprojekti
-  field_is_in_chlog: Tapahtumat näytetään muutoslokissa
   field_is_in_roadmap: Tapahtumat näytetään roadmap näkymässä
   field_login: Kirjautuminen
   field_mail_notification: Sähköposti muistutukset
@@ -404,7 +403,6 @@ fi:
   label_news_plural: Uutiset
   label_news_latest: Viimeisimmät uutiset
   label_news_view_all: Näytä kaikki uutiset
-  label_change_log: Muutosloki
   label_settings: Asetukset
   label_overview: Yleiskatsaus
   label_version: Versio
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c66b7e0ac1..0324f8d423 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -243,7 +243,6 @@ fr:
   field_homepage: Site web
   field_is_public: Public
   field_parent: Sous-projet de
-  field_is_in_chlog: Demandes affichées dans l'historique
   field_is_in_roadmap: Demandes affichées dans la roadmap
   field_login: Identifiant
   field_mail_notification: Notifications par mail
@@ -509,7 +508,6 @@ fr:
   label_news_latest: Dernières annonces
   label_news_view_all: Voir toutes les annonces
   label_news_added: Annonce ajoutée
-  label_change_log: Historique
   label_settings: Configuration
   label_overview: Aperçu
   label_version: Version
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 3a5b71e8b9..873daa57fb 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -255,7 +255,6 @@ gl:
   field_is_default: Estado por defecto
   field_is_filter: Usado como filtro
   field_is_for_all: Para todos os proxectos
-  field_is_in_chlog: Consultar as peticións no histórico
   field_is_in_roadmap: Consultar as peticións na planificación
   field_is_public: Público
   field_is_required: Obrigatorio
@@ -347,7 +346,6 @@ gl:
   label_browse: Ollar
   label_bulk_edit_selected_issues: Editar as peticións seleccionadas
   label_calendar: Calendario
-  label_change_log: Cambios
   label_change_plural: Cambios
   label_change_properties: Cambiar propiedades
   label_change_status: Cambiar o estado
diff --git a/config/locales/he.yml b/config/locales/he.yml
index b199e0479d..a7a6690d57 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -204,7 +204,6 @@ he:
   field_homepage: דף הבית
   field_is_public: פומבי
   field_parent: תת פרויקט של
-  field_is_in_chlog: נושאים המוצגים בדו"ח השינויים
   field_is_in_roadmap: נושאים המוצגים במפת הדרכים
   field_login: שם משתמש
   field_mail_notification: הודעות דוא"ל
@@ -362,7 +361,6 @@ he:
   label_news_plural: חדשות
   label_news_latest: חדשות אחרונות
   label_news_view_all: צפה בכל החדשות
-  label_change_log: דו"ח שינויים
   label_settings: הגדרות
   label_overview: מבט רחב
   label_version: גירסא
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 55117def5b..8e4a977e55 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -233,7 +233,6 @@
   field_homepage: Weboldal
   field_is_public: Nyilvános
   field_parent: Szülő projekt
-  field_is_in_chlog: Feladatok látszanak a változás naplóban
   field_is_in_roadmap: Feladatok látszanak az életútban
   field_login: Azonosító
   field_mail_notification: E-mail értesítések
@@ -421,7 +420,6 @@
   label_news_latest: Legutóbbi hírek
   label_news_view_all: Minden hír megtekintése
   label_news_added: Hír hozzáadva
-  label_change_log: Változás napló
   label_settings: Beállítások
   label_overview: Áttekintés
   label_version: Verzió
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 3cb6e16968..b149e88d27 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -205,7 +205,6 @@ it:
   field_homepage: Homepage
   field_is_public: Pubblico
   field_parent: Sottoprogetto di
-  field_is_in_chlog: Segnalazioni mostrate nel changelog
   field_is_in_roadmap: Segnalazioni mostrate nel roadmap
   field_login: Login
   field_mail_notification: Notifiche via e-mail
@@ -360,7 +359,6 @@ it:
   label_news_plural: Notizie
   label_news_latest: Utime notizie
   label_news_view_all: Tutte le notizie
-  label_change_log: Elenco modifiche
   label_settings: Impostazioni
   label_overview: Panoramica
   label_version: Versione
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 1b97ef758b..c5a0e3455f 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -246,7 +246,6 @@ ja:
   field_homepage: ホームページ
   field_is_public: 公開
   field_parent: 親プロジェクト名
-  field_is_in_chlog: 変更履歴に表示されているチケット
   field_is_in_roadmap: ロードマップに表示されているチケット
   field_login: ログイン
   field_mail_notification: メール通知
@@ -505,7 +504,6 @@ ja:
   label_news_latest: 最新ニュース
   label_news_view_all: 全てのニュースを見る
   label_news_added: ニュースが追加されました
-  label_change_log: 変更履歴
   label_settings: 設定
   label_overview: 概要
   label_version: バージョン
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index d32610063d..73f12331f3 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -273,7 +273,6 @@ ko:
   field_homepage: 홈페이지
   field_is_public: 공개
   field_parent: 상위 프로젝트
-  field_is_in_chlog: 일감 변경이력에 표시
   field_is_in_roadmap: 로드맵에 표시
   field_login: 로그인
   field_mail_notification: 메일 알림
@@ -532,7 +531,6 @@ ko:
   label_news_latest: 최근 뉴스
   label_news_view_all: 모든 뉴스
   label_news_added: 뉴스 추가
-  label_change_log: 변경 이력
   label_settings: 설정
   label_overview: 개요
   label_version: 버전
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 0cedab22bc..605e73be27 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -240,7 +240,6 @@ lt:
   field_homepage: Pagrindinis puslapis
   field_is_public: Viešas
   field_parent: Priklauso projektui
-  field_is_in_chlog: Darbai rodomi pokyčių žurnale
   field_is_in_roadmap: Darbai rodomi veiklos grafike
   field_login: Registracijos vardas
   field_mail_notification: Elektroninio pašto pranešimai
@@ -487,7 +486,6 @@ lt:
   label_news_latest: Paskutinės naujienos
   label_news_view_all: Peržiūrėti visas žinias
   label_news_added: Naujiena pridėta
-  label_change_log: Pakeitimų žurnalas
   label_settings: Nustatymai
   label_overview: Apžvalga
   label_version: Versija
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 525190b7bd..7fc547d2e1 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -217,7 +217,6 @@ nl:
   field_is_default: Standaard
   field_is_filter: Gebruikt als een filter
   field_is_for_all: Voor alle projecten
-  field_is_in_chlog: Issues weergegeven in wijzigingslog
   field_is_in_roadmap: Issues weergegeven in roadmap
   field_is_public: Publiek
   field_is_required: Verplicht
@@ -309,7 +308,6 @@ nl:
   label_browse: Blader
   label_bulk_edit_selected_issues: Bewerk geselecteerde issues in bulk
   label_calendar: Kalender
-  label_change_log: Wijzigingslog
   label_change_plural: Wijzigingen
   label_change_properties: Eigenschappen wijzigen
   label_change_status: Wijzig status
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 28640b0c1b..096485396a 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -205,7 +205,6 @@
   field_homepage: Hjemmeside
   field_is_public: Offentlig
   field_parent: Underprosjekt til
-  field_is_in_chlog: Vises i endringslogg
   field_is_in_roadmap: Vises i veikart
   field_login: Brukernavn
   field_mail_notification: E-post-varsling
@@ -394,7 +393,6 @@
   label_news_latest: Siste nyheter
   label_news_view_all: Vis alle nyheter
   label_news_added: Nyhet lagt til
-  label_change_log: Endringslogg
   label_settings: Innstillinger
   label_overview: Oversikt
   label_version: Versjon
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 6032d8998d..f2a6ab96ab 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -241,7 +241,6 @@ pl:
   field_is_default: Domyślny status
   field_is_filter: Atrybut filtrowania
   field_is_for_all: Dla wszystkich projektów
-  field_is_in_chlog: Zagadnienie pokazywane w zapisie zmian
   field_is_in_roadmap: Zagadnienie pokazywane na mapie
   field_is_public: Publiczny
   field_is_required: Wymagane
@@ -337,7 +336,6 @@ pl:
   label_browse: Przegląd
   label_bulk_edit_selected_issues: Zbiorowa edycja zagadnień
   label_calendar: Kalendarz
-  label_change_log: Lista zmian
   label_change_plural: Zmiany
   label_change_properties: Zmień właściwości
   label_change_status: Status zmian
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 2230ea157c..c34de1c646 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -238,7 +238,6 @@ pt-BR:
   field_homepage: Página inicial
   field_is_public: Público
   field_parent: Sub-projeto de
-  field_is_in_chlog: Exibir na lista de alterações
   field_is_in_roadmap: Exibir no planejamento
   field_login: Usuário
   field_mail_notification: Notificações por e-mail
@@ -432,7 +431,6 @@ pt-BR:
   label_news_latest: Últimas notícias
   label_news_view_all: Ver todas as notícias
   label_news_added: Notícia adicionada
-  label_change_log: Registro de alterações
   label_settings: Configurações
   label_overview: Visão geral
   label_version: Versão
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 0ed999a075..29f5cd28bf 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -223,7 +223,6 @@ pt:
   field_homepage: Página
   field_is_public: Público
   field_parent: Sub-projecto de
-  field_is_in_chlog: Tarefas mostradas no changelog
   field_is_in_roadmap: Tarefas mostradas no roadmap
   field_login: Nome de utilizador
   field_mail_notification: Notificações por e-mail
@@ -417,7 +416,6 @@ pt:
   label_news_latest: Últimas notícias
   label_news_view_all: Ver todas as notícias
   label_news_added: Notícia adicionada
-  label_change_log: Change log
   label_settings: Configurações
   label_overview: Visão geral
   label_version: Versão
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 63dd70b0d7..bd37a3fd38 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -206,7 +206,6 @@ ro:
   field_homepage: Pagina principală
   field_is_public: Public
   field_parent: Sub-proiect al
-  field_is_in_chlog: Tichete afișate în jurnalul de activitate
   field_is_in_roadmap: Tichete afișate în plan
   field_login: Autentificare
   field_mail_notification: Notificări prin e-mail
@@ -461,7 +460,6 @@ ro:
   label_news_latest: Ultimele știri
   label_news_view_all: Afișează toate știrile
   label_news_added: Adăugat
-  label_change_log: Istoric
   label_settings: Setări
   label_overview: Pagină proiect
   label_version: Versiune
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 615cf69e2b..3d8c0ac082 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -319,7 +319,6 @@ ru:
   field_is_default: Значение по умолчанию
   field_is_filter: Используется в качестве фильтра
   field_is_for_all: Для всех проектов
-  field_is_in_chlog: Задачи, отображаемые в журнале изменений
   field_is_in_roadmap: Задачи, отображаемые в оперативном плане
   field_is_public: Общедоступный
   field_is_required: Обязательное
@@ -420,7 +419,6 @@ ru:
   label_calendar: Календарь
   label_calendar_filter: Включая
   label_calendar_no_assigned: не мои
-  label_change_log: Журнал изменений
   label_change_plural: Правки
   label_change_properties: Изменить свойства
   label_change_status: Изменить статус
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index f7338164b2..20369eaa1d 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -205,7 +205,6 @@ sk:
   field_homepage: Domovská stránka
   field_is_public: Verejný
   field_parent: Nadradený projekt
-  field_is_in_chlog: Úlohy zobrazené v rozdielovom logu
   field_is_in_roadmap: Úlohy zobrazené v pláne
   field_login: Login
   field_mail_notification: Emailové oznámenie
@@ -392,7 +391,6 @@ sk:
   label_news_latest: Posledné novinky
   label_news_view_all: Zobrazit všetky novinky
   label_news_added: Novinka pridaná
-  label_change_log: Protokol zmien
   label_settings: Nastavenie
   label_overview: Prehľad
   label_version: Verzia
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index a57ca74f1c..df6eb64cc2 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -206,7 +206,6 @@ sl:
   field_homepage: Domača stran
   field_is_public: Javno
   field_parent: Podprojekt projekta
-  field_is_in_chlog: Zahtevki prikazani v zapisu sprememb
   field_is_in_roadmap: Zahtevki prikazani na zemljevidu
   field_login: Prijava
   field_mail_notification: E-poštna oznanila
@@ -453,7 +452,6 @@ sl:
   label_news_latest: Zadnje novice
   label_news_view_all: Poglej vse novice
   label_news_added: Dodane novice
-  label_change_log: Zapisnik spremeb
   label_settings: Nastavitve
   label_overview: Pregled
   label_version: Verzija
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 6f7151b0f4..6ae247e776 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -216,7 +216,6 @@
   field_homepage: Homepage
   field_is_public: Javni
   field_parent: Potprojekat od
-  field_is_in_chlog: Kartice se prikazuju u dnevniku promena
   field_is_in_roadmap: Kartice se prikazuju u Redosledu
   field_login: Korisnik
   field_mail_notification: Obaveštavanje putem mail-a
@@ -376,7 +375,6 @@
   label_news_plural: Novosti
   label_news_latest: Poslednje novosti
   label_news_view_all: Pregled svih novosti
-  label_change_log: Dnevnik promena
   label_settings: Podešavanja
   label_overview: Pregled
   label_version: Verzija
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 7a445ec9d1..a95d9a348f 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -266,7 +266,6 @@ sv:
   field_homepage: Hemsida
   field_is_public: Publik
   field_parent: Underprojekt till
-  field_is_in_chlog: Visa ärenden i ändringslogg
   field_is_in_roadmap: Visa ärenden i roadmap
   field_login: Användarnamn
   field_mail_notification: Mailnotifieringar
@@ -528,7 +527,6 @@ sv:
   label_news_latest: Senaste nyheterna
   label_news_view_all: Visa alla nyheter
   label_news_added: Nyhet tillagd
-  label_change_log: Ändringslogg
   label_settings: Inställningar
   label_overview: Överblick
   label_version: Version
diff --git a/config/locales/th.yml b/config/locales/th.yml
index f32d3e37cd..961ce24938 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -203,7 +203,6 @@ th:
   field_homepage: หน้าแรก
   field_is_public: สาธารณะ
   field_parent: โครงการย่อยของ
-  field_is_in_chlog: ปัญหาแสดงใน รายกาเปลี่ยนแปลง
   field_is_in_roadmap: ปัญหาแสดงใน แผนงาน
   field_login: ชื่อที่ใช้เข้าระบบ
   field_mail_notification: การแจ้งเตือนทางอีเมล์
@@ -392,7 +391,6 @@ th:
   label_news_latest: ข่าวล่าสุด
   label_news_view_all: ดูข่าวทั้งหมด
   label_news_added: ข่าวถูกเพิ่ม
-  label_change_log: บันทึกการเปลี่ยนแปลง
   label_settings: ปรับแต่ง
   label_overview: ภาพรวม
   label_version: รุ่น
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 313ef12747..c81976014f 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -234,7 +234,6 @@ tr:
   field_homepage: Anasayfa
   field_is_public: Genel
   field_parent: 'Üst proje: '
-  field_is_in_chlog: Değişim günlüğünde gösterilen iletiler
   field_is_in_roadmap: Yol haritasında gösterilen iletiler
   field_login: Giriş
   field_mail_notification: E-posta uyarıları
@@ -421,7 +420,6 @@ tr:
   label_news_latest: Son Haberler
   label_news_view_all: Tüm haberleri oku
   label_news_added: Haber eklendi
-  label_change_log: Değişim Günlüğü
   label_settings: Ayarlar
   label_overview: Genel
   label_version: Versiyon
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index a98ecaac22..1da1159876 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -197,7 +197,6 @@ uk:
   field_homepage: Домашня сторінка
   field_is_public: Публічний
   field_parent: Підпроект
-  field_is_in_chlog: Питання, що відображаються в журналі змін
   field_is_in_roadmap: Питання, що відображаються в оперативному плані
   field_login: Вхід 
   field_mail_notification: Повідомлення за електронною поштою
@@ -362,7 +361,6 @@ uk:
   label_news_plural: Новини
   label_news_latest: Останні новини
   label_news_view_all: Подивитися всі новини
-  label_change_log: Журнал змін
   label_settings: Налаштування
   label_overview: Перегляд
   label_version: Версія
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 3cd633b3f3..cdaa4136bf 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -268,7 +268,6 @@ vi:
   field_homepage: Trang chủ
   field_is_public: Công cộng
   field_parent: Dự án con của
-  field_is_in_chlog: Có thể thấy trong Thay đổi
   field_is_in_roadmap: Có thể thấy trong Kế hoạch
   field_login: Đăng nhập
   field_mail_notification: Thông báo qua email
@@ -462,7 +461,6 @@ vi:
   label_news_latest: Tin mới
   label_news_view_all: Xem mọi tin
   label_news_added: Đã thêm tin
-  label_change_log: Nhật ký thay đổi
   label_settings: Thiết lập
   label_overview: Tóm tắt
   label_version: Phiên bản
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 616d9f678e..442d85039b 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -307,7 +307,6 @@
   field_homepage: 網站首頁
   field_is_public: 公開
   field_parent: 父專案
-  field_is_in_chlog: 項目顯示於變更記錄中
   field_is_in_roadmap: 項目顯示於版本藍圖中
   field_login: 帳戶名稱
   field_mail_notification: 電子郵件提醒選項
@@ -570,7 +569,6 @@
   label_news_latest: 最近新聞
   label_news_view_all: 檢視全部的新聞
   label_news_added: 新聞已新增
-  label_change_log: 變更記錄
   label_settings: 設定
   label_overview: 概觀
   label_version: 版本
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index a923e360b4..97173fc75c 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -240,7 +240,6 @@ zh:
   field_homepage: 主页
   field_is_public: 公开
   field_parent: 上级项目
-  field_is_in_chlog: 在更新日志中显示问题
   field_is_in_roadmap: 在路线图中显示问题
   field_login: 登录名
   field_mail_notification: 邮件通知
@@ -501,7 +500,6 @@ zh:
   label_news_latest: 最近的新闻
   label_news_view_all: 查看所有新闻
   label_news_added: 新闻已添加
-  label_change_log: 更新日志
   label_settings: 配置
   label_overview: 概述
   label_version: 版本
diff --git a/config/routes.rb b/config/routes.rb
index dbb159c335..e2560c1833 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -178,7 +178,7 @@ ActionController::Routing::Routes.draw do |map|
       project_views.connect 'projects.:format', :action => 'index'
       project_views.connect 'projects/new', :action => 'add'
       project_views.connect 'projects/:id', :action => 'show'
-      project_views.connect 'projects/:id/:action', :action => /roadmap|changelog|destroy|settings/
+      project_views.connect 'projects/:id/:action', :action => /roadmap|destroy|settings/
       project_views.connect 'projects/:id/files', :action => 'list_files'
       project_views.connect 'projects/:id/files/new', :action => 'add_file'
       project_views.connect 'projects/:id/versions/new', :action => 'add_version'
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 56a7a458c3..50d090c4d4 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -37,7 +37,7 @@ Redmine::AccessControl.map do |map|
     # Issue categories
     map.permission :manage_categories, {:projects => [:settings, :add_issue_category], :issue_categories => [:edit, :destroy]}, :require => :member
     # Issues
-    map.permission :view_issues, {:projects => [:changelog, :roadmap], 
+    map.permission :view_issues, {:projects => :roadmap, 
                                   :issues => [:index, :changes, :show, :context_menu],
                                   :versions => [:show, :status_by],
                                   :queries => :index,
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 81c3d8b1c7..6bdfc167c2 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -372,29 +372,6 @@ class ProjectsControllerTest < ActionController::TestCase
       :controller => 'projects', :action => 'list_files', :id => '33'
     )
   end
-  
-  def test_changelog_routing
-    assert_routing(
-      {:method => :get, :path => '/projects/44/changelog'},
-      :controller => 'projects', :action => 'changelog', :id => '44'
-    )
-  end
-  
-  def test_changelog
-    get :changelog, :id => 1
-    assert_response :success
-    assert_template 'changelog'
-    assert_not_nil assigns(:versions)
-  end
-  
-  def test_changelog_showing_subprojects_versions
-    get :changelog, :id => 1, :with_subprojects => 1
-    assert_response :success
-    assert_template 'changelog'
-    assert_not_nil assigns(:versions)
-    # Version on subproject appears
-    assert assigns(:versions).include?(Version.find(4))
-  end
 
   def test_roadmap_routing
     assert_routing(