From 5fbbb8e419d2def032065dc7ea1e8dfbbb646dbf Mon Sep 17 00:00:00 2001
From: Ross Jones <ross@servercode.co.uk>
Date: Tue, 27 Jan 2015 16:37:38 +0000
Subject: [PATCH] Fix the dropdown to show title rather than ID

---
 ckan/lib/helpers.py                                         | 2 +-
 ckan/templates/organization/snippets/organization_form.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
index f7123b8ed43..1ca061a96fd 100644
--- a/ckan/lib/helpers.py
+++ b/ckan/lib/helpers.py
@@ -783,7 +783,7 @@ def linked_user(user, maxlength=0, avatar=20):
 
 
 def group_name_to_title(name):
-    group = model.Group.by_name(name)
+    group = model.Group.get(name)
     if group is not None:
         return group.display_name
     return name
diff --git a/ckan/templates/organization/snippets/organization_form.html b/ckan/templates/organization/snippets/organization_form.html
index 3e742fd7fb2..8a4b03717b0 100644
--- a/ckan/templates/organization/snippets/organization_form.html
+++ b/ckan/templates/organization/snippets/organization_form.html
@@ -48,11 +48,11 @@
         <div class="controls">
 
           {% set current_related_group_id = data.related_group_id %}
-          {% set current_related_group_title = current_related_group_id + '!' %}
+          {% set current_related_group_title = h.group_name_to_title(current_related_group_id) %}
 
           <input id="related_group_id" type="text" name="related_group_id" placeholder='{{related_label}}'
-           value="current_related_group" class="control-medium" data-module="autocomplete" data-module-label='title' data-module-key='id' data-module-defaultlabel='{{data.related_group_id}}' data-module-defaultvalue='{{data.related_group_id}}' data-label="{{current_related_group_title}}"
-           data-module-source="/api/2/util/group/autocomplete?type=organization&q=?">
+           value="{{current_related_group_id}}" class="control-medium" data-module="autocomplete" data-module-label='title' data-module-key='id' data-module-defaultlabel='{{current_related_group_title}}' data-module-defaultvalue='{{data.related_group_id}}'
+                      data-module-source="/api/2/util/group/autocomplete?type=organization&q=?">
         </div>
       </div>
     </div>