removed references to api_server as resesarch-fi feature will be a plugin instead

Author: don-stuckey

app/controllers/org_admin/templates_controller.rb

@@ -172,8 +172,6 @@ def create
       args = template_params
       # Swap in the appropriate visibility enum value for the checkbox value
       args[:visibility] = parse_visibility(args, current_user.org)
-      # set api_server if one is associated with this template and its plans
-      args[:api_server_id] = params[:api_server_id]
 
       # creates a new template with version 0 and new family_id
       @template = Template.new(args)
@@ -205,9 +203,6 @@ def update
         # Swap in the appropriate visibility enum value for the checkbox value
         args[:visibility] = parse_visibility(args, current_user.org)
 
-        # set api_server if one is associated with this template and its plans
-        args[:api_server_id] = params[:api_server_id]
-
         template.assign_attributes(args)
         template.links = ActiveSupport::JSON.decode(params['template-links']) if params['template-links'].present?
         if template.save

app/models/template.rb

@@ -18,8 +18,7 @@
 #  created_at       :datetime
 #  updated_at       :datetime
 #  family_id        :integer
-#  org_id           :integer
-#  api_server_id       :integer
+#  org_id           :intege
 #
 # Indexes
 #
@@ -70,8 +69,6 @@ class Template < ApplicationRecord
 
   belongs_to :org
 
-  belongs_to :api_server, optional: true
-
   has_many :plans
 
   has_many :phases, dependent: :destroy
@@ -495,29 +492,29 @@ def template_has_any_question_identifiers(template_id)
     phases = template.phases
     for phase in phases do
       sections = phase.sections
-      for section in sections do 
+      for section in sections do
         questions = section.questions
         for question in questions do
-          if question.question_identifiers.exists? 
+          if question.question_identifiers.exists?
             for qid in question.question_identifiers do
-              if !qid.value.blank? && !qid.name.blank? 
-                  return true 
+              if !qid.value.blank? && !qid.name.blank?
+                  return true
                   break
-              end    
-            end  
-          end  
+              end
+            end
+          end
         end
-      end      
+      end
     end
   end
-  
-  # This method is reponsible to generate the Question Identifiers list 
+
+  # This method is reponsible to generate the Question Identifiers list
   # for one template. It returns a html formated list.
   def html_question_identifiers_list(template_id)
     #Get the template
     template = Template.find(template_id)
     phases = template.phases
-    
+
     html = "<div>"
     for phase in phases do
       sections = phase.sections
@@ -526,63 +523,63 @@ def html_question_identifiers_list(template_id)
       html += "<div>
                 <h4 class=\"modal-title\">Phase - %{phase_title} </h4><hr/>" % { phase_title: phase.title }
 
-      for section in sections do 
+      for section in sections do
         questions = section.questions
 
         # to verify if there is a question identifier in the section
         for question in questions do
             for qid in question.question_identifiers do
-              if !qid.value.blank? && !qid.name.blank? 
+              if !qid.value.blank? && !qid.name.blank?
                 html += "<div>
                   <h5 class=\"modal-title\">Section - %{section_title}</h5>" % { section_title: section.title }
-              end   
-              break   
-            end    
+              end
+              break
+            end
           break
-        end      
+        end
 
         # to display the question text and the question identifiers
         for question in questions do
-          if question.question_identifiers.exists? 
+          if question.question_identifiers.exists?
             html += "<ul>"
-            
+
             for qid in question.question_identifiers do
-              if !qid.value.blank? && !qid.name.blank? 
+              if !qid.value.blank? && !qid.name.blank?
                 clean_question_text = question.text.gsub(/<p>(.*?)<\/p>/, "\\1")
                 html += "<div class=\"col-md-8\">
                   <label>Question %{question_number} - %{question_text}</label></div>" % { question_number: question.number, question_text: clean_question_text }
-              end   
-              break   
-            end    
-                  
+              end
+              break
+            end
+
             for qid in question.question_identifiers do
-              if !qid.value.blank? && !qid.name.blank? 
+              if !qid.value.blank? && !qid.name.blank?
                 html += "<li class=\"list-group-item\" style=\"border: none\">Identifier Value: %{identifier_value}</li>" % { identifier_value: qid.value }
                 html += "<li class=\"list-group-item\" style=\"border: none\">Identifier Name: %{identifier_name}</li>" % { identifier_name: qid.name }
-              end  
+              end
             end
             html += "</ul>"
-            
+
           end
-                
+
         end
-        html += "<hr/></div>" 
+        html += "<hr/></div>"
       end
-      html += "<hr/></div>" 
-    end 
+      html += "<hr/></div>"
+    end
 
-    html += "</div>" 
-  end   
+    html += "</div>"
+  end
 
 
-  # This method is reponsible to generate the Question Identifiers list 
+  # This method is reponsible to generate the Question Identifiers list
   # for one template. It returns a html formated list.
   def export_question_identifiers_list(template_id)
     #Get the template
     template = Template.find(template_id)
     phases = template.phases
-    
-    html = "<html>  
+
+    html = "<html>
               <head>
                 <title>%{template_title}</title>
               </head>
@@ -593,54 +590,54 @@ def export_question_identifiers_list(template_id)
 
       html += "<h2>Phase - %{phase_title}</h2>" % { phase_title: phase.title }
 
-      for section in sections do 
+      for section in sections do
         questions = section.questions
 
         # to verify if there is a question identifier in the section
         for question in questions do
             for qid in question.question_identifiers do
-              if !qid.value.blank? && !qid.name.blank? 
+              if !qid.value.blank? && !qid.name.blank?
                 html += "<h3>Section - %{section_title}</h3>" % { section_title: section.title }
-              end   
-              break   
-            end    
+              end
+              break
+            end
           break
-        end      
+        end
 
         # to display the question text and the question identifiers
         for question in questions do
-          if question.question_identifiers.exists? 
+          if question.question_identifiers.exists?
             html += "<ul>"
-            
+
             for qid in question.question_identifiers do
-              if !qid.value.blank? && !qid.name.blank? 
+              if !qid.value.blank? && !qid.name.blank?
                 clean_question_text = question.text.gsub(/<p>(.*?)<\/p>/, "\\1")
                 html += "
                   <p>Question %{question_number} - %{question_text}</p>" % { question_number: question.number, question_text: clean_question_text }
-              end   
-              break   
-            end    
-                  
+              end
+              break
+            end
+
             for qid in question.question_identifiers do
-              if !qid.value.blank? && !qid.name.blank? 
+              if !qid.value.blank? && !qid.name.blank?
                 html += "<li>Identifier Value: %{identifier_value}</li>" % { identifier_value: qid.value }
                 html += "<li>Identifier Name: %{identifier_name}</li>" % { identifier_name: qid.name }
-              end  
+              end
             end
             html += "</ul><br>"
-            
+
           end
-                
+
         end
-        html += "<br>" 
+        html += "<br>"
       end
-    end 
+    end
 
     html += "</body>
-    </html>" 
-  end   
+    </html>"
+  end
+
 
-  
 
 
   private

app/views/org_admin/templates/_form.html.erb

@@ -11,19 +11,6 @@
   <%= f.text_area(:description, class: "template", spellcheck: true) %>
 </div>
 
-<% if Rails.configuration.x.research_fi.active %>
-  <div class="form-control mb-3">
-    <div class="row">
-      <div class="col-6">
-        <%= f.label(:api_server, _('Enable interoperation with an external system'), class: "form-label")%>
-        <%= select_tag :api_server_id, 
-          options_for_select(ApiServer.pluck(:title, :id), selected: f.object.api_server_id),
-          class: 'form-select', "aria-labelledby": "api_server_id", include_blank: _("--Select--")%>
-      </div>
-    </div>
-  </div>
-<% end %>
-
 <% if current_user.org.funder? && !current_user.org.funder_only? %>
   <!-- If the Org is a funder and another org type then allow then to set the visibility -->
   <div class="form-control mb-3 col-xs-8">