[#6441] Hide and disable unassignable deliverables from the issue

* Hide - Closed deliverables
* Hide - Closed contract deliverables
* Disable - Locked deliverables
* Disable - Locked contract deliverables

app/views/issues/_bulk_edit_deliverable.html.erb

@@ -1,14 +1,10 @@
 <% if project.module_enabled?(:contracts) && User.current.allowed_to?(:assign_deliverable_to_issue, project) %>
   <p>
     <%= label_tag(:deliverable_id, l(:field_deliverable)) %>
-    <% options = project.contracts.inject([]) {|data, contract|
-         data << [contract.name, contract.deliverables.collect {|d| [d.title, d.id]} ]
-       } %>
-
     <%= select_tag('deliverable_id',
                    content_tag('option', l(:label_no_change_option), :value => '') +
                    content_tag('option', l(:label_none), :value => 'none') +
-                   grouped_options_for_select(options)) %>
+                   grouped_deliverable_options_for_select(project)) %>
   </p>
 <% end %>
 

app/views/issues/_edit_deliverable.html.erb

@@ -1,6 +1,6 @@
 <% if project.module_enabled?(:contracts) && User.current.allowed_to?(:assign_deliverable_to_issue, project) %>
   <p>
-    <%= form.select(:deliverable_id, grouped_options_for_select(deliverable_options(project), issue.deliverable_id), {:include_blank => true}) %>
+    <%= form.select(:deliverable_id, grouped_deliverable_options_for_select(project, issue.deliverable_id), {:include_blank => true}) %>
   </p>
 <% end %>