From e106c7a0cda0b0a33cdbf67509703ac8194c87bf Mon Sep 17 00:00:00 2001 From: Rob H Date: Sat, 30 Aug 2014 01:21:35 +1000 Subject: [PATCH] Initialise user autocomplete element using data from element itself rather than AJAX request --- .../admin/users/directives/user_autocomplete.js.coffee | 3 +-- app/views/admin/enterprises/_form.html.haml | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/admin/users/directives/user_autocomplete.js.coffee b/app/assets/javascripts/admin/users/directives/user_autocomplete.js.coffee index 956f370fb7..a904d1bcce 100644 --- a/app/assets/javascripts/admin/users/directives/user_autocomplete.js.coffee +++ b/app/assets/javascripts/admin/users/directives/user_autocomplete.js.coffee @@ -4,8 +4,7 @@ angular.module("admin.users").directive "ofnUserAutocomplete", ($http) -> element.select2 multiple: false initSelection: (element, callback) -> - $http.get( Spree.url(Spree.routes.user_search, { ids: element.val() }) ).success (data) -> - callback(data[0]) if data.length > 0 + callback { id: element.val(), email: attrs.email } ajax: url: Spree.routes.user_search datatype: 'json' diff --git a/app/views/admin/enterprises/_form.html.haml b/app/views/admin/enterprises/_form.html.haml index 0981f7dfc9..6f86c3e703 100644 --- a/app/views/admin/enterprises/_form.html.haml +++ b/app/views/admin/enterprises/_form.html.haml @@ -27,7 +27,8 @@ .with-tip{'data-powertip' => "The primary user responsible for this enterprise."} %a What's this? .eight.columns - = f.hidden_field :owner_id, class: "select2 fullwidth", 'ofn-user-autocomplete' => true + - owner_email = @enterprise.andand.owner.andand.email || "" + = f.hidden_field :owner_id, class: "select2 fullwidth", 'ofn-user-autocomplete' => true, email: owner_email .row .three.columns.alpha