From 1f7aec0c1d7f56d292a5ff3ba38b8595ffd75d43 Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Thu, 26 Feb 2015 13:09:46 +1100
Subject: [PATCH] group owner select box in own tab

---
 .../controllers/side_menu_controller.js.coffee     |  1 +
 app/views/admin/enterprise_groups/_form.html.haml  |  1 +
 .../_form_primary_details.html.haml                |  9 ---------
 .../admin/enterprise_groups/_form_users.html.haml  | 14 ++++++++++++++
 4 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 app/views/admin/enterprise_groups/_form_users.html.haml

diff --git a/app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee b/app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee
index 63f05a9376..7b9a8165a1 100644
--- a/app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee
+++ b/app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee
@@ -5,6 +5,7 @@ angular.module("admin.enterprise_groups")
 
     $scope.menu.setItems [
       { name: 'Primary Details', icon_class: "icon-user" }
+      { name: 'Users', icon_class: "icon-user" }
       { name: 'About', icon_class: "icon-pencil" }
       { name: 'Images', icon_class: "icon-picture" }
       { name: 'Contact', icon_class: "icon-phone" }
diff --git a/app/views/admin/enterprise_groups/_form.html.haml b/app/views/admin/enterprise_groups/_form.html.haml
index 1b96909d3e..39a4b8bd1e 100644
--- a/app/views/admin/enterprise_groups/_form.html.haml
+++ b/app/views/admin/enterprise_groups/_form.html.haml
@@ -8,6 +8,7 @@
       .one.column &nbsp;
       .eleven.columns.omega.fullwidth_inputs
         = render 'form_primary_details', f: f
+        = render 'form_users', f: f
         = render 'form_about', f: f
         = render 'form_images', f: f
         = render 'form_address', f: f
diff --git a/app/views/admin/enterprise_groups/_form_primary_details.html.haml b/app/views/admin/enterprise_groups/_form_primary_details.html.haml
index 27dec0701c..6d326e33fa 100644
--- a/app/views/admin/enterprise_groups/_form_primary_details.html.haml
+++ b/app/views/admin/enterprise_groups/_form_primary_details.html.haml
@@ -10,15 +10,6 @@
     %br/
     = f.text_field :description
 
-  - if spree_current_user.admin?
-    .row
-      .three.columns.alpha
-        =f.label :owner_id, 'Owner'
-        .with-tip{'data-powertip' => "The primary user responsible for this group."}
-          %a What's this?
-      .eight.columns.omega
-        = f.hidden_field :owner_id, class: "select2 fullwidth", 'ofn-user-autocomplete' => true, email: @owner_email
-
   = f.field_container :on_front_page do
     = f.label :on_front_page, 'On front page?'
     %br/
diff --git a/app/views/admin/enterprise_groups/_form_users.html.haml b/app/views/admin/enterprise_groups/_form_users.html.haml
new file mode 100644
index 0000000000..0a8a5dd635
--- /dev/null
+++ b/app/views/admin/enterprise_groups/_form_users.html.haml
@@ -0,0 +1,14 @@
+%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='Users'" } }
+  %legend Users
+  .row
+    .three.columns.alpha
+      =f.label :owner_id, 'Owner'
+      .with-tip{'data-powertip' => "The primary user responsible for this group."}
+        %a What's this?
+    .eight.columns.omega
+    - if spree_current_user.admin?
+      = f.hidden_field :owner_id,
+        class: "select2 fullwidth",
+        'user-select' => "{id:'#{@enterprise_group.owner.andand.id}', email:'#{@enterprise_group.owner.andand.email}'}"
+    - else
+      = @enterprise_group.owner.andand.email