Merged r11762 and r11763 from trunk (#13783).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11835 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-12 09:43:59 +00:00
parent 958f1accec
commit 2a6dadf787
5 changed files with 39 additions and 5 deletions
@@ -77,7 +77,7 @@ class EnumerationsController < ApplicationController
        return
      end
    end
-    @enumerations = @enumeration.class.all - [@enumeration]
+    @enumerations = @enumeration.class.system.all - [@enumeration]
  end

  private