diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-16 16:33:27 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-16 16:33:27 +0000 |
| commit | 7f1fb7ce81ddd02006ee9050f2a56b249f9dd474 (patch) | |
| tree | f237586969dabe6746ae27e3121a826dea886862 /app | |
| parent | 5ac4b6670f40546b63282ef598936065961c2f6b (diff) | |
| download | redmine-7f1fb7ce81ddd02006ee9050f2a56b249f9dd474.tar.gz redmine-7f1fb7ce81ddd02006ee9050f2a56b249f9dd474.zip | |
Don't show "Required" option for standard/custom fields that are always required.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10010 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/workflows_helper.rb | 11 | ||||
| -rw-r--r-- | app/views/workflows/permissions.html.erb | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb index 62dca80b3..912b8f153 100644 --- a/app/helpers/workflows_helper.rb +++ b/app/helpers/workflows_helper.rb @@ -18,13 +18,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. module WorkflowsHelper + def field_required?(field) + field.is_a?(CustomField) ? field.is_required? : %w(project_id tracker_id subject priority_id).include?(field) + end + def field_permission_tag(permissions, status, field) name = field.is_a?(CustomField) ? field.id.to_s : field - 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 + options = [["", ""], [l(:label_readonly), "readonly"]] + options << [l(:label_required), "required"] unless field_required?(field) select_tag("permissions[#{name}][#{status.id}]", options_for_select(options, permissions[status.id][name])) end diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb index ecfadec02..c5979b0e3 100644 --- a/app/views/workflows/permissions.html.erb +++ b/app/views/workflows/permissions.html.erb @@ -58,7 +58,7 @@ <% @fields.each do |field, name| %> <tr class="<%= cycle("odd", "even") %>"> <td> - <%=h name %> + <%=h name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %> </td> <% for status in @statuses -%> <td align="center" class="<%= @permissions[status.id][field] %>"> @@ -77,7 +77,7 @@ <% @custom_fields.each do |field| %> <tr class="<%= cycle("odd", "even") %>"> <td> - <%=h field.name %> + <%=h field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %> </td> <% for status in @statuses -%> <td align="center" class="<%= @permissions[status.id][field.id.to_s] %>"> |