Explorar el Código

Minor refector to avoid global @agent

Andrew Cantino hace 10 años
padre
commit
4bb833fd89

+ 1 - 1
app/controllers/agents_controller.rb

@@ -43,7 +43,7 @@ class AgentsController < ApplicationController
         :can_control_other_agents => @agent.can_control_other_agents?,
         :options => @agent.default_options,
         :description_html => @agent.html_description,
-        :form => render_to_string(partial: 'oauth_dropdown')
+        :form => render_to_string(partial: 'oauth_dropdown', locals: { agent: @agent })
     }
   end
 

+ 1 - 1
app/views/agents/_form.html.erb

@@ -31,7 +31,7 @@
           </div>
 
           <div class='oauthable-form'>
-            <%= render partial: 'oauth_dropdown' %>
+            <%= render partial: 'oauth_dropdown', locals: { agent: @agent } %>
           </div>
 
           <div class="form-group">

+ 2 - 2
app/views/agents/_oauth_dropdown.html.erb

@@ -1,6 +1,6 @@
-<% if @agent.try(:oauthable?) %>
+<% if agent.try(:oauthable?) %>
   <div class="form-group type-select">
     <%= label_tag :service %>
-    <%= select_tag 'agent[service_id]', options_for_select(@agent.valid_services_for(current_user).collect { |s| ["(#{s.provider}) #{s.name}", s.id]}, @agent.service_id), class: 'form-control' %>
+    <%= select_tag 'agent[service_id]', options_for_select(agent.valid_services_for(current_user).collect { |s| ["(#{s.provider}) #{s.name}", s.id]}, agent.service_id), class: 'form-control' %>
   </div>
 <% end %>