refactoring few raw_first_column/raw_row in templates with pluck and …

…ids aces#1454
MontrealSergiy · Jan 14, 2025 · c618437 · c618437
1 parent aec2730
commit c618437
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/BrainPortal/app/views/tasks/_tasks_display.html.erb b/BrainPortal/app/views/tasks/_tasks_display.html.erb
@@ -252,7 +252,7 @@
         <%= colored_archived_status(as) %>
         <% if task.cluster_workdir_size.present? %>
           <%= colored_pretty_size(task.cluster_workdir_size, :blank => '') %>
-        <% elsif as == :userfile && ar_file_size = Userfile.where(:id => task.workdir_archive_userfile_id).raw_first_column(:size)[0] %>
+        <% elsif as == :userfile && ar_file_size = Userfile.where(:id => task.workdir_archive_userfile_id).pluck(:size)[0] %>
           (<%= colored_pretty_size(ar_file_size, :blank => '') %>)
         <% end %>
       <% end %>

diff --git a/BrainPortal/app/views/userfiles/_quality_control_panel.html.erb b/BrainPortal/app/views/userfiles/_quality_control_panel.html.erb
@@ -57,7 +57,7 @@
     Full list of tags:<br>
     <select name="tag_ids[]" multiple="multiple" style="width: 15em" size="4" >
       <%= options_from_collection_for_select current_user.available_tags, 'id', 'name',
-          @userfile.get_tags_for_user(current_user).raw_first_column(:id) %>
+          @userfile.get_tags_for_user(current_user).ids %>
     </select>
   </fieldset>
 

diff --git a/BrainPortal/app/views/users/_users_table.html.erb b/BrainPortal/app/views/users/_users_table.html.erb
@@ -120,7 +120,7 @@
     ) { |u| u.last_connected_at ? to_localtime(u.last_connected_at, :datetime) : "Unknown" }
 
     t.column("Projects", :groups) do |u|
-      group_names = u.assignable_groups.order(:name).raw_first_column(:name).reject { |n| n == u.login }
+      group_names = u.assignable_groups.order(:name).pluck(:name).reject { |n| n == u.login }
       if group_names.size > 1 && group_names.size < 40
         html_tool_tip(pluralize(group_names.size, "project"), :offset_x => 60) do
           array_to_table(group_names,

diff --git a/BrainPortal/lib/tasks/cbrain_plugins.rake b/BrainPortal/lib/tasks/cbrain_plugins.rake
@@ -411,8 +411,7 @@ namespace :cbrain do
       puts "Checking for orphan userfiles..."
       orphan_userfiles = Userfile
         .where("type not in (?)", userfile_classes)
-        .raw_rows([:id, :type])
-        .to_a
+        .pluck(:id, :type)
       unless orphan_userfiles.empty?
         puts "#{orphan_userfiles.size} orphan userfile(s) found:"
         orphan_userfiles.each do |orphan|
@@ -423,8 +422,7 @@ namespace :cbrain do
       puts "Checking for orphan tasks..."
       orphan_tasks = CbrainTask
         .where("type not in (?)", task_classes)
-        .raw_rows([:id, :type])
-        .to_a
+        .pluck(:id, :type)
       unless orphan_tasks.empty?
         puts "#{orphan_tasks.size} orphan task(s) found:"
         orphan_tasks.each do |orphan|