Add attributes to containers

cyder/base/eav/models.py

@@ -12,6 +12,7 @@
 
 class Attribute(models.Model):
     search_fields = ('name',)
+    display_fields = ('name',)
 
     class Meta:
         app_label = 'cyder'
@@ -25,6 +26,14 @@ class Meta:
     def __unicode__(self):
         return self.name
 
+    def details(self):
+        data = {}
+        data['data'] = [
+            ('Name', 'name', self),
+        ]
+        data['url'] = ""
+        return data
+
 
 class EAVBase(BaseModel, ObjectUrlMixin):
     """The entity-attribute-value base model

cyder/base/tablefier.py

@@ -6,14 +6,15 @@
 
 class Tablefier:
     def __init__(self, objects, request=None, extra_cols=None,
-                 users=False, custom=None, update=True):
+                 users=False, custom=None, update=True, obj_type=""):
         if users:
             from cyder.core.cyuser.models import UserProfile
             objects = UserProfile.objects.filter(user__in=objects)
 
         self.objects = objects
         self.request = request
         self.custom = custom
+        self.obj_type = obj_type
         if self.custom:
             self.extra_cols = None
             self.update = False
@@ -106,9 +107,11 @@ def build_data(self, obj, value):
 
     @staticmethod
     def build_extra(d):
-        data_fields = ['value', 'url', 'img', 'class']
+        data_fields = ['value', 'url', 'img', 'class', 'pk']
         if not isinstance(d['value'], list):
             for k, v in d.items():
+                if k == 'pk':
+                    continue
                 d[k] = [v]
         col = dict(filter(lambda (k, v): k in data_fields, d.items()))
         return col
@@ -137,8 +140,8 @@ def build_update_field(obj):
                          ('objType', obj._meta.db_table),
                          ('getUrl', reverse('get-update-form')),
                          ('prettyObjType', obj.pretty_type)],
-                         [('kwargs', '{"obj_type": "' + str(obj._meta.db_table)
-                              + '", "pk": "' + str(obj.id) + '"}')]],
+                        [('kwargs', '{"obj_type": "' + str(obj_type)
+                          + '", "pk": "' + str(obj.id) + '"}')]],
                'class': ['update', 'delete'],
                'img': ['/media/img/update.png', '/media/img/delete.png']}
         return col
@@ -183,6 +186,7 @@ def get_table(self):
         self.headers  # generate headers first to select related objects
         objs, data, urls = self.get_data()
         return {
+            'obj_type': self.obj_type,
             'headers': self.headers,
             'postback_urls': urls,
             'data': data,

cyder/base/utils.py

@@ -99,7 +99,7 @@ def make_paginator(request, qs, num=20, obj_type=None):
 
 
 def tablefy(objects, users=False, extra_cols=None, info=True, request=None,
-            update=True):
+            update=True, obj_type=""):
     """Make list of table headers, rows of table data, list of urls
     that may be associated with table data, and postback urls.
 
@@ -112,7 +112,7 @@ def tablefy(objects, users=False, extra_cols=None, info=True, request=None,
                        },]
     """
     t = Tablefier(objects, request=request, users=users,
-                  extra_cols=extra_cols, update=update)
+                  extra_cols=extra_cols, update=update, obj_type=obj_type)
     return t.get_table()
 
 

cyder/core/ctnr/forms.py

@@ -27,7 +27,8 @@ class CtnrObjectForm(forms.Form):
             ('user', 'User'),
             ('domain', 'Domain'),
             ('range', 'Range'),
-            ('workgroup', 'Workgroup')))
+            ('workgroup', 'Workgroup'),
+            ('attribute', 'Attribute')))
 
     def __init__(self, *args, **kwargs):
         obj_perm = kwargs.pop('obj_perm', False)

cyder/core/ctnr/models.py

@@ -10,6 +10,7 @@
 from cyder.cydhcp.constants import DYNAMIC
 from cyder.cydhcp.range.models import Range
 from cyder.cydhcp.workgroup.models import Workgroup
+from cyder.base.eav.models import Attribute
 from cyder.core.validation import validate_ctnr_name
 
 
@@ -24,6 +25,7 @@ class Ctnr(BaseModel, ObjectUrlMixin):
     domains = models.ManyToManyField(Domain, null=False, blank=True)
     ranges = models.ManyToManyField(Range, null=False, blank=True)
     workgroups = models.ManyToManyField(Workgroup, null=False, blank=True)
+    attributes = models.ManyToManyField(Attribute, null=False, blank=True)
     description = models.CharField(max_length=200, blank=True)
     email_contact = models.CharField(max_length=75, blank=True)
 

cyder/core/ctnr/views.py

@@ -30,6 +30,7 @@ def ctnr_detail(request, pk):
     ctnrRdomains = ctnr.domains.select_related().filter(is_reverse=True)
     ctnrRanges = ctnr.ranges.select_related()
     ctnrWorkgroups = ctnr.workgroups.select_related()
+    ctnrAttributes = ctnr.attributes.select_related()
 
     if request.user.get_profile().has_perm(
             request, ACTION_UPDATE, obj_class='CtnrObject', ctnr=ctnr):
@@ -51,13 +52,19 @@ def ctnr_detail(request, pk):
         workgroup_table = tablefy(workgroups, extra_cols=extra_cols,
                                   request=request)
 
+        extra_cols, attributes = create_obj_extra_cols(
+            ctnr, ctnrAttributes, 'attribute')
+        attribute_table = tablefy(attributes, extra_cols=extra_cols,
+                                  request=request, obj_type='attribute')
+
         object_form = CtnrObjectForm(obj_perm=True)
 
     else:
         domain_table = tablefy(ctnrDomains, request=request)
         rdomain_table = tablefy(ctnrRdomains, request=request)
         range_table = tablefy(ctnrRanges, request=request)
         workgroup_table = tablefy(ctnrWorkgroups, request=request)
+        attribute_table = None
         object_form = CtnrObjectForm()
         object_form.fields['obj_type'] = ChoiceField(widget=HiddenInput,
                                                      initial='user')
@@ -85,6 +92,7 @@ def ctnr_detail(request, pk):
         'rdomain_table': rdomain_table,
         'range_table': range_table,
         'workgroup_table': workgroup_table,
+        'attribute_table': attribute_table,
         'add_user_form': add_user_form,
         'object_select_form': object_form
     })
@@ -145,7 +153,7 @@ def create_user_extra_cols(ctnr, ctnrusers, actions=False):
                 'url': reverse('ctnr-update-user',
                                kwargs={'ctnr_pk': ctnr.id}),
                 'img': '/media/img/remove.png',
-                'class': 'remove user'
+                'class': 'remove user',
             })
 
     extra_cols[0]['data'] = level_data
@@ -171,7 +179,8 @@ def create_obj_extra_cols(ctnr, obj_set, obj_type):
             'url': reverse('ctnr-remove-object', kwargs={
                 'ctnr_pk': ctnr.id}),
             'img': '/media/img/remove.png',
-            'class': 'remove object'
+            'class': 'remove object',
+            'pk': str(obj.pk),
         })
         objs.append(obj)
     extra_cols[0]['data'] = remove_data

cyder/templates/base/tables.html

@@ -21,10 +21,12 @@
         {% for col in row %}
           <td class="{{object_table['headers'][i][0] | lower}}_column">
             {% for cell in col['value'] %}
-              {% if col['url'][loop.index0] %}
+            {% if col['url'][loop.index0] %}
                 <a{% if col['class'] %} class="{{ col['class'][loop.index0] }}"{% endif %}
                   {% if col['data'] %}{% if col['data'][loop.index0] %}{% for data in col['data'][loop.index0] %} data-{{ data[0] }}="{{ data[1] }}"{% endfor %}{% endif %}{% endif %}
-                  href="{{ col['url'][loop.index0] }}">
+                  href="{{ col['url'][loop.index0] }}"
+                  {% if object_table['obj_type'] %} col_obj_type={{ object_table['obj_type'] }} {% endif %}
+                  {% if col['pk'] %} col_pk={{ col['pk'] }} {% endif %}>
                   {% if col['img'] and col['img'][loop.index0] %}
                     <img alt="{{ cell }}" src="{{ col['img'][loop.index0] }}">
                   {% else %}

cyder/templates/ctnr/ctnr_detail.html

@@ -59,6 +59,11 @@ <h3>Domains</h3>
     {% if rdomain_table %}
       <h3>Reverse Domains</h3>
       {{ render_table(request, rdomain_table) }}
+      {% endif %}
+
+    {% if attribute_table %}
+      <h3>Attributes</h3>
+      {{ render_table(request, attribute_table) }}
     {% endif %}
   </div>
 

media/js/ctnr/ctnr.js

@@ -22,8 +22,12 @@ $(document).ready(function() {
         var url = $(this).attr('href');
         var lvl;
         var detailUrl = $(this).parent().parent().find('a:first').attr('href');
-        var pk = detailUrl.split('/').slice(-2)[0];
-        var obj_type = detailUrl.split('/').slice(2)[0];
+        var obj_type = $(this).parent().find('a:first').attr('col_obj_type')
+        if (obj_type == '' || typeof(obj_type) == "undefined")
+            obj_type = detailUrl.split('/').slice(2)[0];
+        var pk = $(this).parent().find('a:first').attr('col_pk')
+        if (pk == '' || typeof(pk) == "undefined")
+            pk = detailUrl.split('/').slice(-2)[0];
         var action = 'user_level';
         var acknowledge = true;
         if ($(this).attr('class') == 'minus') {