diff app/helpers/versions_helper.rb @ 523:0b6c82dead28 luisf

Merge from branch "cannam"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 25 Jul 2011 14:23:37 +0100
parents cbce1fd3b1b7
children cbb26bc654de
line wrap: on
line diff
--- a/app/helpers/versions_helper.rb	Mon Mar 28 18:17:06 2011 +0100
+++ b/app/helpers/versions_helper.rb	Mon Jul 25 14:23:37 2011 +0100
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# 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
@@ -17,11 +17,10 @@
 
 module VersionsHelper
 
-  STATUS_BY_CRITERIAS = %w(category tracker priority author assigned_to)
+  STATUS_BY_CRITERIAS = %w(category tracker status priority author assigned_to)
   
   def render_issue_status_by(version, criteria)
-    criteria ||= 'category'
-    raise 'Unknown criteria' unless STATUS_BY_CRITERIAS.include?(criteria)
+    criteria = 'category' unless STATUS_BY_CRITERIAS.include?(criteria)
     
     h = Hash.new {|k,v| k[v] = [0, 0]}
     begin