diff --git a/forms/admin_number_change.rb b/forms/admin_number_change.rb index 0eaa289d91468582d60113a037b9684cac3062cf..94392163b0a8d56f496b2d3b787ad75bafcf5202 100644 --- a/forms/admin_number_change.rb +++ b/forms/admin_number_change.rb @@ -19,7 +19,7 @@ field( field( var: "new_backend", type: "list-single", - open: @cheogram, + open: true, label: "Backend to change to?", description: "Leave blank to keep current backend, or specify new backend JID", @@ -29,12 +29,3 @@ field( }, value: "" ) - -unless @cheogram - field( - var: "custom_backend", - type: "text-single", - label: "Custom backend (overrides dropdown if filled in)", - value: "" - ) -end diff --git a/lib/admin_actions/number_change.rb b/lib/admin_actions/number_change.rb index 9a67c5a2adb9ba55432c51c337bf806b6a2479a4..23ec6ee48acca25fd9f98cee47e23a8e01ab3379 100644 --- a/lib/admin_actions/number_change.rb +++ b/lib/admin_actions/number_change.rb @@ -26,8 +26,7 @@ class AdminAction end def form - cheogram = ::Command.execution.iq.from.resource =~ /\ACheogram/ - FormTemplate.render("admin_number_change", cheogram: cheogram) + FormTemplate.render("admin_number_change") end def change(result) @@ -37,9 +36,6 @@ class AdminAction .reject { |_k, v| v == "nil" || v.to_s.empty? } .tap { |form_h| form_h["new_backend"] ||= @bag[:old_backend] - if (custom = form_h.delete("custom_backend")) - form_h["new_backend"] = custom - end form_h["new_tel"] ||= @bag[:old_tel] } .transform_keys(&:to_sym)