Removed IssueStatus html_color attribute.

Issue list colorization can be done using a custom theme. Each row is given a class that correspond to the issue status (eg. status-1 where 1 is the status position).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@881 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb
index 62b2cb762ae1231363ecf3a679e69ef06208e8f0..a5d228405d7febd2411bf3e507192052c6c49324 100644 (file)
--- a/app/models/issue_status.rb
+++ b/app/models/issue_status.rb
@@ -24,8 +24,6 @@ class IssueStatus < ActiveRecord::Base
   validates_uniqueness_of :name
   validates_length_of :name, :maximum => 30
   validates_format_of :name, :with => /^[\w\s\'\-]*$/i
-  validates_length_of :html_color, :is => 6
-  validates_format_of :html_color, :with => /^[a-f0-9]*$/i
 
   def before_save
     IssueStatus.update_all "is_default=#{connection.quoted_false}" if self.is_default?

diff --git a/app/views/issue_statuses/_form.rhtml b/app/views/issue_statuses/_form.rhtml
index 7f6dc5be094f728a425f23d2bf77ef97b6143eda..6ae0a7c330acf29b530a0f5d8ec192951d0aebfd 100644 (file)
--- a/app/views/issue_statuses/_form.rhtml
+++ b/app/views/issue_statuses/_form.rhtml
@@ -11,8 +11,5 @@
 <p><label for="issue_status_is_default"><%=l(:field_is_default)%></label>
 <%= check_box 'issue_status', 'is_default' %></p>
 
-<p><label for="issue_status_html_color"><%=l(:field_html_color)%><span class="required"> *</span></label>
-#<%= text_field 'issue_status', 'html_color', :maxlength => 6 %></p>
-
 <!--[eoform:issue_status]-->
 </div>
\ No newline at end of file

diff --git a/db/migrate/077_remove_issue_statuses_html_color.rb b/db/migrate/077_remove_issue_statuses_html_color.rb
new file mode 100644 (file)
index 0000000..a3e2c3f
--- /dev/null
+++ b/db/migrate/077_remove_issue_statuses_html_color.rb
@@ -0,0 +1,9 @@
+class RemoveIssueStatusesHtmlColor < ActiveRecord::Migration
+  def self.up
+    remove_column :issue_statuses, :html_color
+  end
+
+  def self.down
+    raise IrreversibleMigration
+  end
+end

diff --git a/lang/bg.yml b/lang/bg.yml
index 07360a3c47efd51167a1ec04845a0dd935c546d1..a034d4e1b6c40408472f0ca2302319b53b8b47e3 100644 (file)
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -110,7 +110,6 @@ field_status: Статус
 field_notes: Бележка
 field_is_closed: Затворена задача
 field_is_default: Статус по подразбиране
-field_html_color: Цвят
 field_tracker: Тракер
 field_subject: Тема
 field_due_date: Крайна дата

diff --git a/lang/cs.yml b/lang/cs.yml
index 86d9a494cd40f7c0fcbbbe1c86d088d4c659ac17..0918e9543853d9669326afafe33ece61dd48d725 100644 (file)
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -110,7 +110,6 @@ field_status: Stav
 field_notes: Poznámka
 field_is_closed: Požadavek uzavřen
 field_is_default: Výchozí stav
-field_html_color: Barva
 field_tracker: Fronta
 field_subject: Předmět
 field_due_date: Po lhůtě

diff --git a/lang/de.yml b/lang/de.yml
index c1acaa3670c3777d42872b2a80c794898e19a983..ac6f7a7c37abf4a859c04ee17ddab5f9336682b1 100644 (file)
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -110,7 +110,6 @@ field_status: Status
 field_notes: Kommentare
 field_is_closed: Problem erledigt
 field_is_default: Default
-field_html_color: Farbe
 field_tracker: Tracker
 field_subject: Thema
 field_due_date: Abgabedatum

diff --git a/lang/en.yml b/lang/en.yml
index 480f30a13ffa0a9e72bce23d8cd9bea6f7ebbfd5..ea8ff25b022f2a3076615f59a0a8b0077d4fdc59 100644 (file)
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -114,7 +114,6 @@ field_status: Status
 field_notes: Notes
 field_is_closed: Issue closed
 field_is_default: Default value
-field_html_color: Color
 field_tracker: Tracker
 field_subject: Subject
 field_due_date: Due date

diff --git a/lang/es.yml b/lang/es.yml
index 16a2d3ac358c29246cecc257bedf2a7d2c02e6fd..453d1dfcf684af2f3c7e1d19b786f620f592c581 100644 (file)
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -107,7 +107,6 @@ field_status: Estado
 field_notes: Notas
 field_is_closed: Petición resuelta
 field_is_default: Estado por defecto
-field_html_color: Color
 field_tracker: Tracker
 field_subject: Tema
 field_due_date: Fecha debida

diff --git a/lang/fr.yml b/lang/fr.yml
index 9bd28c08234d6967d0dc8f13f5cc2cb32f48f463..ee10720ec266383b059c7570151dd3f8e7820880 100644 (file)
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -114,7 +114,6 @@ field_status: Statut
 field_notes: Notes
 field_is_closed: Demande fermée
 field_is_default: Valeur par défaut
-field_html_color: Couleur
 field_tracker: Tracker
 field_subject: Sujet
 field_due_date: Date d'échéance

diff --git a/lang/he.yml b/lang/he.yml
index 97fa51e064b7bdf848cd32f2b3c04d1fdd81e5ae..bed09f10c0afbd8d7b30b4e52a5aa8a9965ae9d8 100644 (file)
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -112,7 +112,6 @@ field_status: מצב
 field_notes: הערות
 field_is_closed: נושא סגור
 field_is_default: ערך ברירת מחדל
-field_html_color: צבע
 field_tracker: עוקב
 field_subject: שם נושא
 field_due_date: תאריך סיום

diff --git a/lang/it.yml b/lang/it.yml
index 03442eb41428abcbdd75201ccaab11a857e84776..23761914f21b09acd8258cf1c151f81fed798178 100644 (file)
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -110,7 +110,6 @@ field_status: Stato
 field_notes: Note
 field_is_closed: Chiude il contesto
 field_is_default: Stato predefinito
-field_html_color: Colore
 field_tracker: Tracker
 field_subject: Oggetto
 field_due_date: Data ultima

diff --git a/lang/ja.yml b/lang/ja.yml
index 226f565699cdf2175a1309da7806096fbc214dfd..6636a440c7cbe60c8760bde131f04cd38e9168d9 100644 (file)
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -111,7 +111,6 @@ field_status: ステータス
 field_notes: 注記
 field_is_closed: 終了した問題
 field_is_default: デフォルトのステータス
-field_html_color: 色
 field_tracker: トラッカー
 field_subject: 題名
 field_due_date: 期限日

diff --git a/lang/ko.yml b/lang/ko.yml
index 2ff051e804645c854d8f477ef79fe32ae0110b01..a11930a8a112c6e0c1770810f5da81b0c3d7972c 100644 (file)
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -112,7 +112,6 @@ field_status: 상태
 field_notes: 노트
 field_is_closed: 완료된 문제
 field_is_default: 기본값
-field_html_color: 색상
 field_tracker: 구분
 field_subject: 제목
 field_due_date: 완료 기한

diff --git a/lang/nl.yml b/lang/nl.yml
index 8202428696da6bda52b36b9f58bd524f0ed3a9c1..6b317914134345cc5a99fe1eb96efcf62dc8f775 100644 (file)
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -110,7 +110,6 @@ field_status: Status
 field_notes: Notities
 field_is_closed: Issue gesloten
 field_is_default: Default status
-field_html_color: Kleur
 field_tracker: Tracker
 field_subject: Onderwerp
 field_due_date: Verwachte datum gereed

diff --git a/lang/pl.yml b/lang/pl.yml
index ea7485d2d39b64c104986e375598a954c4095d14..cc8ffb72222e769b86a0ff4059e076f816c84c0b 100644 (file)
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -107,7 +107,6 @@ field_status: Status
 field_notes: Notatki
 field_is_closed: Zgłoszenie zamknięte
 field_is_default: Domyślny status
-field_html_color: Kolor
 field_tracker: Typ zgłoszenia
 field_subject: Temat
 field_due_date: Data oddania

diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index bce1d2630262b9e45ce61737509aa36e9c419fbe..3ab30641a7f941b3e3f90a72b42a8550329d5891 100644 (file)
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -110,7 +110,6 @@ field_status: Status
 field_notes: Notas\r
 field_is_closed: Tarefa fechada\r
 field_is_default: Status padrao\r
-field_html_color: Cor\r
 field_tracker: Tipo\r
 field_subject: Titulo\r
 field_due_date: Data devida\r

diff --git a/lang/pt.yml b/lang/pt.yml
index e9233f33327d0b5b5873fdcdc6bf542023200d54..0cd5d65c76cee9bf8ff4ff49d373f2e3d05ff181 100644 (file)
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -110,7 +110,6 @@ field_status: Status
 field_notes: Notas
 field_is_closed: Tarefa fechada
 field_is_default: Status padrão
-field_html_color: Cor
 field_tracker: Tipo
 field_subject: Assunto
 field_due_date: Data final

diff --git a/lang/ro.yml b/lang/ro.yml
index b6002ac8794ba71e0522ede7b59b4efa8a79f1ed..ecd09a522548ebe21967ce43b1921ca2ef1c7295 100644 (file)
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -110,7 +110,6 @@ field_status: Statut
 field_notes: Note
 field_is_closed: Tichet rezolvat
 field_is_default: Statut de baza
-field_html_color: Culoare
 field_tracker: Tip tichet
 field_subject: Subiect
 field_due_date: Data finalizarii 

diff --git a/lang/sr.yml b/lang/sr.yml
index 39ae09da3b11d5248f0da0563eac0e635c562928..c48f61320660bffd2fdede0aba623057c1cd957c 100644 (file)
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -114,7 +114,6 @@ field_status: Status
 field_notes: Beleške
 field_is_closed: Greška zatvorena
 field_is_default: Podrazumevana vrednost
-field_html_color: Boja
 field_tracker: Tracker
 field_subject: Subjekat
 field_due_date: Do datuma

diff --git a/lang/sv.yml b/lang/sv.yml
index df814fbae8819c0fb233f005131d7c1d33290eb0..06fd11ebae08a56b97a0d198f34f3d9c757a27f8 100644 (file)
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -110,7 +110,6 @@ field_status: Status
 field_notes: Anteckningar
 field_is_closed: Brist stängd
 field_is_default: Defaultstatus
-field_html_color: Färg
 field_tracker: Tracker
 field_subject: Rubrik
 field_due_date: Färdigdatum

diff --git a/lang/zh.yml b/lang/zh.yml
index 6b3d095e50bf07a395a51fda7ccc23bcfb362a3b..45f1cb012852c494c1a2f216cab9136e5dac3c4f 100644 (file)
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -113,7 +113,6 @@ field_status: 状态
 field_notes: 说明
 field_is_closed: 已关闭的任务
 field_is_default: 默认状态
-field_html_color: 颜色
 field_tracker: 跟踪
 field_subject: 主题
 field_due_date: 到期日

diff --git a/lib/tasks/load_default_data.rake b/lib/tasks/load_default_data.rake
index 27f59328c6a147820d04c5932d5a8bb18eb83a40..8e89d4ecd3da683299e0312df5911d4c639d13aa 100644 (file)
--- a/lib/tasks/load_default_data.rake
+++ b/lib/tasks/load_default_data.rake
@@ -114,12 +114,12 @@ begin
   Tracker.create(:name => l(:default_tracker_support), :is_in_chlog => false, :is_in_roadmap => false, :position => 3)\r
   \r
   # issue statuses\r
-  new       = IssueStatus.create(:name => l(:default_issue_status_new), :is_closed => false, :is_default => true, :html_color => 'F98787', :position => 1)\r
-  assigned  = IssueStatus.create(:name => l(:default_issue_status_assigned), :is_closed => false, :is_default => false, :html_color => 'C0C0FF', :position => 2)\r
-  resolved  = IssueStatus.create(:name => l(:default_issue_status_resolved), :is_closed => false, :is_default => false, :html_color => '88E0B3', :position => 3)\r
-  feedback  = IssueStatus.create(:name => l(:default_issue_status_feedback), :is_closed => false, :is_default => false, :html_color => 'F3A4F4', :position => 4)\r
-  closed    = IssueStatus.create(:name => l(:default_issue_status_closed), :is_closed => true, :is_default => false, :html_color => 'DBDBDB', :position => 5)\r
-  rejected  = IssueStatus.create(:name => l(:default_issue_status_rejected), :is_closed => true, :is_default => false, :html_color => 'F5C28B', :position => 6)\r
+  new       = IssueStatus.create(:name => l(:default_issue_status_new), :is_closed => false, :is_default => true, :position => 1)\r
+  assigned  = IssueStatus.create(:name => l(:default_issue_status_assigned), :is_closed => false, :is_default => false, :position => 2)\r
+  resolved  = IssueStatus.create(:name => l(:default_issue_status_resolved), :is_closed => false, :is_default => false, :position => 3)\r
+  feedback  = IssueStatus.create(:name => l(:default_issue_status_feedback), :is_closed => false, :is_default => false, :position => 4)\r
+  closed    = IssueStatus.create(:name => l(:default_issue_status_closed), :is_closed => true, :is_default => false, :position => 5)\r
+  rejected  = IssueStatus.create(:name => l(:default_issue_status_rejected), :is_closed => true, :is_default => false, :position => 6)\r
   \r
   # workflow\r
   Tracker.find(:all).each { |t|\r

diff --git a/test/fixtures/issue_statuses.yml b/test/fixtures/issue_statuses.yml
index b5a509f392031ccfc216e5a05841f56b9db7e101..c7b10ba0728cd23f1bb87d2e5a38d8bf540ebb94 100644 (file)
--- a/test/fixtures/issue_statuses.yml
+++ b/test/fixtures/issue_statuses.yml
@@ -2,36 +2,30 @@
 issue_statuses_006: \r
   name: Rejected\r
   is_default: false\r
-  html_color: F5C28B\r
   is_closed: true\r
   id: 6\r
 issue_statuses_001: \r
   name: New\r
   is_default: true\r
-  html_color: F98787\r
   is_closed: false\r
   id: 1\r
 issue_statuses_002: \r
   name: Assigned\r
   is_default: false\r
-  html_color: C0C0FF\r
   is_closed: false\r
   id: 2\r
 issue_statuses_003: \r
   name: Resolved\r
   is_default: false\r
-  html_color: 88E0B3\r
   is_closed: false\r
   id: 3\r
 issue_statuses_004: \r
   name: Feedback\r
   is_default: false\r
-  html_color: F3A4F4\r
   is_closed: false\r
   id: 4\r
 issue_statuses_005: \r
   name: Closed\r
   is_default: false\r
-  html_color: DBDBDB\r
   is_closed: true\r
   id: 5\r

diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 744cc49d6146b5dae7b201c9d72da36c4297e6e0..86cea62f8894844c23a1e4321161bc18fdf496e5 100644 (file)
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -54,7 +54,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
     get :list_documents, :id => 1\r
     assert_response :success
     assert_template 'list_documents'\r
-    assert_not_nil assigns(:documents)\r
+    assert_not_nil assigns(:grouped)\r
   end\r
   \r
   def test_list_issues\r