add controller to ServiceAdmin
diff --git a/xos/core/admin.py b/xos/core/admin.py
index c5efa29..477459f 100644
--- a/xos/core/admin.py
+++ b/xos/core/admin.py
@@ -1034,7 +1034,7 @@
list_display = ("backend_status_icon", "name", "kind",
"versionNumber", "enabled", "published")
list_display_links = ('backend_status_icon', 'name', )
- fieldList = ["backend_status_text", "name", "kind", "description", "versionNumber", "enabled", "published",
+ fieldList = ["backend_status_text", "name", "kind", "description", "controller", "versionNumber", "enabled", "published",
"view_url", "icon_url", "public_key", "private_key_fn", "service_specific_attribute", "service_specific_id"]
fieldsets = [
(None, {'fields': fieldList, 'classes': ['suit-tab suit-tab-general']})]
diff --git a/xos/core/models/service.py b/xos/core/models/service.py
index 7b0ef4f..9fae22d 100644
--- a/xos/core/models/service.py
+++ b/xos/core/models/service.py
@@ -69,6 +69,8 @@
name = StrippedCharField(max_length=30, help_text="Service Name")
base_url = StrippedCharField(max_length=1024, help_text="Base URL, allows use of relative URLs for resources", null=True, blank=True)
+ def __unicode__(self): return u'%s' % (self.name)
+
class ServiceControllerResource(PlCoreBase):
KIND_CHOICES = (('models', 'Models'),
('admin', 'Admin'),
@@ -90,6 +92,8 @@
format = StrippedCharField(choices=FORMAT_CHOICES, max_length=30)
url = StrippedCharField(max_length=1024, help_text="URL of resource", null=True, blank=True)
+ def __unicode__(self): return u'%s' % (self.name)
+
class Service(PlCoreBase, AttributeMixin):
# when subclassing a service, redefine KIND to describe the new service
KIND = "generic"