From e23511076cd7dc2f4f471c483d75df8130f2ce4a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 15 Jul 2012 16:57:04 +0000 Subject: No blank option for custom fields marked as required on workflow settings. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10001 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/workflows_helper.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'app/helpers/workflows_helper.rb') diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb index a9bc5ac81..62dca80b3 100644 --- a/app/helpers/workflows_helper.rb +++ b/app/helpers/workflows_helper.rb @@ -20,8 +20,12 @@ module WorkflowsHelper def field_permission_tag(permissions, status, field) name = field.is_a?(CustomField) ? field.id.to_s : field - select_tag("permissions[#{name}][#{status.id}]", - options_for_select([["", ""], [l(:label_readonly), "readonly"], [l(:label_required), "required"]], permissions[status.id][name]) - ) + options = [["", ""], [l(:label_readonly), "readonly"], [l(:label_required), "required"]] + + if field.is_a?(CustomField) && field.is_required? + options = [["(#{l(:label_required)})", ""], [l(:label_readonly), "readonly"]] + end + + select_tag("permissions[#{name}][#{status.id}]", options_for_select(options, permissions[status.id][name])) end end -- cgit v1.2.3