app/controllers/concepts/hierarchical_controller.rb in iqvoc-4.3.3 vs app/controllers/concepts/hierarchical_controller.rb in iqvoc-4.4.0

@@ -13,60 +13,58 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 class Concepts::HierarchicalController < ConceptsController
-
   def index
     authorize! :read, Iqvoc::Concept.base_class
 
     scope = Iqvoc::Concept.base_class
-    scope = params[:published] == "0" ? scope.editor_selectable : scope.published
+    scope = params[:published] == '0' ? scope.editor_selectable : scope.published
 
     # only select unexpired concepts
     scope = scope.not_expired
 
     # if params[:broader] is given, the action is handling the reversed tree
     root_id = params[:root]
     if root_id && root_id =~ /\d+/
       # NB: order matters; see the following `where`
       if params[:broader]
-        scope = scope.includes(:narrower_relations, :broader_relations)
+        scope = scope.includes(:narrower_relations, :broader_relations).references(:relations)
       else
-        scope = scope.includes(:broader_relations, :narrower_relations)
+        scope = scope.includes(:broader_relations, :narrower_relations).references(:relations)
       end
       @concepts = scope.where(Concept::Relation::Base.arel_table[:target_id].eq(root_id))
     else
       if params[:broader]
-        @concepts = scope.broader_tops.includes(:broader_relations)
+        @concepts = scope.broader_tops.includes(:broader_relations).references(:concepts)
       else
-        @concepts = scope.tops.includes(:narrower_relations)
+        @concepts = scope.tops.includes(:narrower_relations).references(:concepts)
       end
     end
 
     # When in single query mode, AR handles ALL includes to be loaded by that
     # one query. We don't want that! So let's do it manually :-)
-    ActiveRecord::Associations::Preloader.new(@concepts,
-        Iqvoc::Concept.base_class.default_includes + [:pref_labels]).run
+    ActiveRecord::Associations::Preloader.new.preload(@concepts,
+        Iqvoc::Concept.base_class.default_includes + [:pref_labels])
 
-    @concepts.sort! do |a, b|
+    @concepts.to_a.sort! do |a, b|
       a.pref_label.to_s <=> b.pref_label.to_s
     end
 
     respond_to do |format|
       format.html
       format.json do # Treeview data
-        concepts = @concepts.select {|c| can? :read, c }.map do |c|
+        concepts = @concepts.select { |c| can? :read, c }.map do |c|
           {
-            :id   => c.id,
-            :url  => concept_path(:id => c, :format => :html),
-            :text => CGI.escapeHTML(c.pref_label.to_s),
-            :hasChildren => (params[:broader] ? c.broader_relations.any? : c.narrower_relations.any?),
-            :additionalText => (" (#{c.additional_info})" if c.additional_info.present?)
+            id: c.id,
+            url: concept_path(id: c, format: :html),
+            text: CGI.escapeHTML(c.pref_label.to_s),
+            hasChildren: (params[:broader] ? c.broader_relations.any? : c.narrower_relations.any?),
+            additionalText: (" (#{c.additional_info})" if c.additional_info.present?)
           }
         end
-        render :json => concepts
+        render json: concepts
       end
     end
   end
-
 end