jro_apps/redmine Commit - r15687:9d1d3b825f1d

Improve custom fields list performance (#24587)....

Jean-Philippe Lang -

r15687:9d1d3b825f1d

parent child

Context file:

r15687:9d1d3b825f1d

Collapse all files

app/controllers/custom_fields_controller.rb +2 0

             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class CustomFieldsController < ApplicationController
               layout 'admin'
               self.main_menu = false
               before_action :require_admin
               before_action :build_new_custom_field, :only => [:new, :create]
               before_action :find_custom_field, :only => [:edit, :update, :destroy]
               accept_api_auth :index
               def index
                 respond_to do |format|
                   format.html {
                     @custom_fields_by_type = CustomField.all.group_by {|f| f.class.name }
+                    @custom_fields_projects_count =
+                      IssueCustomField.where(is_for_all: false).joins(:projects).group(:custom_field_id).count
                   }
                   format.api {
                     @custom_fields = CustomField.all
                   }
                 end
               end
               def new
                 @custom_field.field_format = 'string' if @custom_field.field_format.blank?
                 @custom_field.default_value = nil
               end
               def create
                 if @custom_field.save
                   flash[:notice] = l(:notice_successful_create)
                   call_hook(:controller_custom_fields_new_after_save, :params => params, :custom_field => @custom_field)
                   redirect_to edit_custom_field_path(@custom_field)
                 else
                   render :action => 'new'
                 end
               end
               def edit
               end
               def update
                 @custom_field.safe_attributes = params[:custom_field]
                 if @custom_field.save
                   call_hook(:controller_custom_fields_edit_after_save, :params => params, :custom_field => @custom_field)
                   respond_to do |format|
                     format.html {
                       flash[:notice] = l(:notice_successful_update)
                       redirect_back_or_default edit_custom_field_path(@custom_field)
                     }
                     format.js { head 200 }
                   end
                 else
                   respond_to do |format|
                     format.html { render :action => 'edit' }
                     format.js { head 422 }
                   end
                 end
               end
               def destroy
                 begin
                   @custom_field.destroy
                 rescue
                   flash[:error] = l(:error_can_not_delete_custom_field)
                 end
                 redirect_to custom_fields_path(:tab => @custom_field.class.name)
               end
               private
               def build_new_custom_field
                 @custom_field = CustomField.new_subclass_instance(params[:type])
                 if @custom_field.nil?
                   render :action => 'select_type'
                 else
                   @custom_field.safe_attributes = params[:custom_field]
                 end
               end
               def find_custom_field
                 @custom_field = CustomField.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/views/custom_fields/_index.html.erb +1 -1

             <table class="list custom_fields">
               <thead><tr>
                 <th><%=l(:field_name)%></th>
                 <th><%=l(:field_field_format)%></th>
                 <th><%=l(:field_is_required)%></th>
                 <% if tab[:name] == 'IssueCustomField' %>
                   <th><%=l(:field_is_for_all)%></th>
                   <th><%=l(:label_used_by)%></th>
                 <% end %>
                 <th></th>
               </tr></thead>
               <tbody>
               <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
                 <% back_url = custom_fields_path(:tab => tab[:name]) %>
                 <tr class="<%= cycle("odd", "even") %>">
                   <td class="name"><%= link_to custom_field.name, edit_custom_field_path(custom_field) %></td>
                   <td><%= l(custom_field.format.label) %></td>
                   <td><%= checked_image custom_field.is_required? %></td>
                   <% if tab[:name] == 'IssueCustomField' %>
                   <td><%= checked_image custom_field.is_for_all? %></td>
-                  <td><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
+                  <td><%= l(:label_x_projects, :count => @custom_fields_projects_count[custom_field.id]) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
                   <% end %>
                   <td class="buttons">
                     <%= reorder_handle(custom_field, :url => custom_field_path(custom_field), :param => 'custom_field') %>
                     <%= delete_link custom_field_path(custom_field) %>
                   </td>
                 </tr>
               <% end; reset_cycle %>
               </tbody>
             </table>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages