RDQ3 - SmartIssuesSort - updated to work with Redmine 2.4. Broke when Query role visibility was introduced.

Author: phillmv

app/views/queries/_form.html.erb

@@ -2,6 +2,8 @@
 
 <div class="box">
 <div class="tabular">
+<%= hidden_field_tag 'gantt', '1' if params[:gantt] %>
+
 <p><label for="query_name"><%=l(:field_name)%></label>
 <%= text_field 'query', 'name', :size => 80 %></p>
 
@@ -15,43 +17,58 @@
 <%= javascript_tag "new Ajax.Autocompleter('query_category', 'query_categories_choices', '#{ url_for(:controller => 'smart_issues_sort', :action => 'autocomplete_for_category') }', { minChars: 1, frequency: 0.5, paramName: 'category' });" %>
 <%# VVK end %>
 
-<% if User.current.admin? || User.current.allowed_to?(:manage_public_queries, @project) %>
-<p><label for="query_is_public"><%=l(:field_is_public)%></label>
-<%= check_box 'query', 'is_public',
-      :onchange => (User.current.admin? ? nil : 'if (this.checked) {$("#query_is_for_all").removeAttr("checked"); $("#query_is_for_all").attr("disabled", true);} else {$("#query_is_for_all").removeAttr("disabled");}') %></p>
 
+<% if User.current.admin? || User.current.allowed_to?(:manage_public_queries, @project) %>
+<p><label><%=l(:field_visible)%></label>
+  <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_PRIVATE %> <%= l(:label_visibility_private) %></label>
+  <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_ROLES %> <%= l(:label_visibility_roles) %>:</label>
+  <% Role.givable.sorted.each do |role| %>
+    <label class="block role-visibility"><%= check_box_tag 'query[role_ids][]', role.id, @query.roles.include?(role), :id => nil %> <%= role.name %></label>
+  <% end %>
+  <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_PUBLIC %> <%= l(:label_visibility_public) %></label>
+  <%= hidden_field_tag 'query[role_ids][]', '' %>
+</p>
 <% end %>
 
 <p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label>
 <%= check_box_tag 'query_is_for_all', 1, @query.project.nil?,
       :disabled => (!@query.new_record? && (@query.project.nil? || (@query.is_public? && !User.current.admin?))) %></p>
 
+<fieldset><legend><%= l(:label_options) %></legend>
 <p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
 <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
       :onclick => 'if (this.checked) {$("#columns").hide();} else {$("#columns").show();}' %></p>
 
-
 <p><label for="query_group_by"><%= l(:field_group_by) %></label>
 <%= select 'query', 'group_by', @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, :include_blank => true %></p>
 
 <p><label><%= l(:button_show) %></label>
 <%= available_block_columns_tags(@query) %></p>
+
+<% if params[:gantt] %>
+  <p><label><%= l(:label_gantt) %></label>
+  <label class="inline"><%= check_box_tag "query[draw_relations]", "1", @query.draw_relations %> <%= l(:label_related_issues) %></label>
+  <label class="inline"><%= check_box_tag "query[draw_progress_line]", "1", @query.draw_progress_line %> <%= l(:label_gantt_progress_line) %></label>
+  </p>
+<% end %>
+</fieldset>
 </div>
 
 <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
 <%= render :partial => 'queries/filters', :locals => {:query => query}%>
 </fieldset>
 
 <fieldset><legend><%= l(:label_sort) %></legend>
-<%# VVK start %>
+  <%# VVK start %>
   <p>
     &nbsp;&nbsp;
     <%= check_box 'query', 'sort_by_parent_first' %>
     <label for="query_sort_by_parent_first"><%=l(:label_qg_sort_by_parent_issue)%></label>
   </p>
 <%# VVK end %>
+
 <% 3.times do |i| %>
-<%= i+1 %>:
+<%= i+1 %>: 
 <%= label_tag "query_sort_criteria_attribute_" + i.to_s,
               l(:description_query_sort_criteria_attribute), :class => "hidden-for-sighted" %>
 <%= select_tag("query[sort_criteria][#{i}][]",
@@ -73,8 +90,18 @@
 
 </div>
 
+<%= javascript_tag do %>
+$(document).ready(function(){
+  $("input[name='query[visibility]']").change(function(){
+    var checked = $('#query_visibility_1').is(':checked');
+    $("input[name='query[role_ids][]'][type=checkbox]").attr('disabled', !checked);
+  }).trigger('change');
+});
+<% end %>
+
 <%# VVK start %>
 <% content_for :header_tags do %>
     <%= stylesheet_link_tag 'stylesheet', :plugin => SIS_AssetHelpers::PLUGIN_NAME %>
 <% end %>
 <%# VVK end %>
+