removes references to models from views

Author: madoleary

app/controllers/cases_controller.rb

@@ -7,6 +7,7 @@ class CasesController < ApplicationController
   before_action :authenticate_user!, except: %i[index show list_all]
   before_action :set_curator, only: [:destroy]
   before_action :set_case, only: %i[show edit update destroy]
+  before_action :set_topics, only: %i[new edit]
 
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
@@ -83,6 +84,10 @@ def set_case
     @case = Case.find(params[:id])
   end
 
+  def set_topics
+    @topics = Topic.order('title ASC')
+  end
+
   def case_params
     params.require(:case).permit(:classification, :score, :title, :description, :topic_id, :privacy_related, :docbot_regex)
   end

app/controllers/documents_controller.rb

@@ -27,6 +27,9 @@ class DocumentsController < ApplicationController
 
   before_action :authenticate_user!, except: %i[index show]
   before_action :set_document, only: %i[show edit update crawl restore_points]
+  before_action :set_services, only: %i[new edit]
+  before_action :set_document_names, only: %i[new edit]
+  before_action :set_crawlers, only: %i[new edit]
 
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
@@ -149,6 +152,18 @@ def set_document
     @document = Document.find(params[:id].to_i)
   end
 
+  def set_services
+    @services = Service.order('name ASC')
+  end
+
+  def set_document_names
+    @document_names = Document::VALID_NAMES
+  end
+
+  def set_crawlers
+    @crawlers = Rails.env.development? ? DEV_CRAWLERS : PROD_CRAWLERS
+  end
+
   def document_params
     params.require(:document).permit(:service, :service_id, :user_id, :name, :url, :xpath, :crawler_server)
   end

app/controllers/points_controller.rb

@@ -8,7 +8,8 @@ class PointsController < ApplicationController
 
   before_action :authenticate_user!, except: [:show]
   before_action :set_point, only: %i[show edit update review post_review approve decline]
-  before_action :set_topics, only: %i[new create edit update approve]
+  before_action :set_topics, only: %i[new edit]
+  before_action :set_services, only: %i[new edit]
   before_action :check_status, only: %i[create update]
 
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
@@ -183,6 +184,10 @@ def set_topics
     @topics = Topic.all.includes(:cases).all
   end
 
+  def set_services
+    @services = Service.order('name ASC')
+  end
+
   def point_params
     params.require(:point).permit(:title, :source, :status, :analysis, :service_id, :query, :point_change, :case_id, :document, :source)
   end

app/views/cases/_form.html.erb

@@ -1,11 +1,11 @@
 <div class="form-login">
   <div class="row row-form">
-    <%= simple_form_for([@case]) do |f| %>
+    <%= simple_form_for([case_obj]) do |f| %>
       <div class="form-inputs col-xs-12">
         <%= f.input :title, placeholder: "Case title", label: 'Title' %>
         <%= f.input :classification, as: :radio_buttons, collection: [['blocker', 'blocker'], ['bad', 'bad'], ['neutral', 'neutral'], ['good', 'good']] %>
-        <%= f.input :score, placeholder: 50, input_html: { min: 0, max: 100, value: @case.score || 50 }, label: 'Weight', hint: "Range: 0..100. Higher weights make good points extra good, and bad/blocker points extra bad. Higher weight points have more impact on a service's rating, and are also displayed more prominently in the review summaries on <a href=\"https://tosdr.org\">ToS;DR</a>.".html_safe %>
-        <%= f.association :topic, collection: Topic.order('title ASC'), hint: "Pick the topic where the case applies" %>
+        <%= f.input :score, placeholder: 50, input_html: { min: 0, max: 100, value: case_obj.score || 50 }, label: 'Weight', hint: "Range: 0..100. Higher weights make good points extra good, and bad/blocker points extra bad. Higher weight points have more impact on a service's rating, and are also displayed more prominently in the review summaries on <a href=\"https://tosdr.org\">ToS;DR</a>.".html_safe %>
+        <%= f.association :topic, collection: topics, hint: "Pick the topic where the case applies" %>
         <%= f.input :description, as: :text , input_html: { rows: 3, class: "text-area" } %>
         <%= f.input :docbot_regex, label: 'DocBot Regex', hint: "(Optional) Regex for use in the DocBot Server. Insert nothing if you do not know what this is." %>
         <%= f.input :privacy_related, label: "This case is related to privacy, meaning it will affect <a href=\"https://spreadprivacy.com/privacy-simplified/\">DuckDuckGo's Privacy Grade</a>.".html_safe, checked_value: true, unchecked_value: false %>

app/views/cases/create.html.erb

@@ -1,5 +1,5 @@
 <% content_for :title do %>
   <title>Edit Case <%= @case.id %> (ToS;DR Phoenix)</title>
 <% end %>
-<%= render 'form' %>
+<%= render 'form', case_obj: @case, topics: @topics %>
 

app/views/cases/destroy.html.erb

@@ -23,7 +23,7 @@
         </div>
 
         <div class="col-lg-6 text-right justify-content-end">
-          <% if current_user && current_user.curator %>
+          <% if current_user&.curator %>
             <%= link_to 'Add Case', new_case_path, class: 'btn btn-primary smaller-btn-text' %>
           <% end %>
         </div>

app/views/cases/edit.html.erb

@@ -1,4 +1,4 @@
 <% content_for :title do %>
   <title>New Case (ToS;DR Phoenix)</title>
 <% end %>
-<%= render 'form' %>
+<%= render 'form', case_obj: @case, topics: @topics %>

app/views/cases/index.html.erb

@@ -46,4 +46,4 @@
 <br>
 <br>
 
-  <%= render 'shared/comments', comments: @case.case_comments.includes([:user, :spams]) %>
+<%= render 'shared/comments', comments: @case.case_comments.includes([:user, :spams]) %>