Changeset 58641b0

Timestamp:

05/27/11 17:03:22 (2 years ago)

Author:

Pall Sigurdsson <palli@…>

Branches:

master

Children:

349a990, f87a326

Parents:

c0847d6

git-author:

Pall Sigurdsson <palli@…> (05/27/11 17:03:22)

git-committer:

Pall Sigurdsson <palli@…> (05/27/11 17:03:22)

Message:

objectbrowser commit at end of day

Location:

adagios

Files:

• configurator/views.py (modified) (1 diff)
• objectbrowser/urls.py (modified) (1 diff)
• objectbrowser/views.py (modified) (3 diffs)
• templates/objectbrowser/list_objects.html (modified) (2 diffs)
• templates/objectbrowser/view_object.html (modified) (2 diffs)

adagios/configurator/views.py

@@ -35 +35 @@
         c['contacts'] = get_contacts()
         return render_to_response('configurator/list_contacts.html', c)
-
 
 def host(request, host_name=None):

adagios/objectbrowser/urls.py

@@ -9 +9 @@
     
     #(r'/contact/+$', 'objectbrowser.views.list_contacts'),
+    (r'/(?P<object_type>.+)/(?P<attribute_name>.+)=(?P<attribute_value>.+)$', 'objectbrowser.views.view_objects'),
+    (r'/(?P<attribute_name>.+)=(?P<attribute_value>.+)$', 'objectbrowser.views.list_objects'),
     (r'/(?P<object_type>.+)+$', 'objectbrowser.views.list_objects'),
-    (r'/(?P<object_type>.+)/+$', 'objectbrowser.views.list_objects'),
+    (r'/+$', 'objectbrowser.views.list_object_types'),
+    
     #(r'/contact/(?P<contact_name>.+)$', 'objectbrowser.views.get_contact'),
 

adagios/objectbrowser/views.py

@@ -30 +30 @@
         return render_to_response('configurator/list_contacts.html', c)
 
-def list_objects( request, object_type ):
+
+def list_objects( request, object_type=None, attribute_name=None, attribute_value=None ):
     c = {}
     c['messages'] = m = []
     c['objects'] = objects = []
+    if attribute_name=='object_type':
+        object_type=attribute_value
     if not Model.string_to_class.has_key(object_type):
         m.append('Model does not have any objects of type %s, valid types are %s' % (object_type, Model.string_to_class.keys()))
     else:
         myClass = Model.string_to_class[object_type]
-        c['objects'] = myClass.objects.all
+        if attribute_name is None:
+            c['objects'] = myClass.objects.all
+        else:
+            tmp = {attribute_name:attribute_value}
+            c['objects'] = myClass.objects.filter(**tmp)
+            m.append("I used the filter %s=%s" % (attribute_name, attribute_value))
     m.append( "Found %s objects of type %s" % (len(c['objects']), object_type))
     return render_to_response('objectbrowser/list_objects.html', c)
@@ -54 +62 @@
 '''
 
-def view_object( request, object_type, object_name ):
-        c = {}
-        c['object_type'] = object_type
-        o = ObjectDefinition(object_type)
-        return render_to_response('objectbrowser/view_object.html')
+def view_objects( request, object_type,  attribute_name=None, attribute_value=None ):
+    c = {}
+    c['messages'] = m = []
+    c['objects'] = objects = []
+    if not Model.string_to_class.has_key(object_type):
+        m.append('Model does not have any objects of type %s, valid types are %s' % (object_type, Model.string_to_class.keys()))
+    else:
+        myClass = Model.string_to_class[object_type]
+        if attribute_name is None:
+            c['objects'] = myClass.objects.all
+        else:
+            tmp = {attribute_name:attribute_value}
+            c['objects'] = myClass.objects.filter(**tmp)
+            m.append("I used the filter %s=%s" % (attribute_name, attribute_value))
+    m.append( "Found %s objects of type %s" % (len(c['objects']), object_type))
+    attributes = []
+    c['first_object'] = c['objects'][0]
+    c['first_object'].data = ["1","2"]
+    for tmp in c['objects']:
+        for k in tmp.keys():
+            if k not in attributes: attributes.append( k )
+    for i in c['objects']:
+        i.my_data = "test"
+    attr_val = []
+    for i in attributes:
+        if c['first_object']._defined_attributes.has_key(i):
+            defined_attr = c['first_object']._defined_attributes[i]
+        else:
+            defined_attr = ""
+        if i in c['first_object']._inherited_attributes:
+            inherited_attr = c['first_object']._inherited_attributes[i]
+        else:
+            inherited_attr = ""
+        if None != inherited_attr or None != defined_attr:
+            attr_val.append( [i, defined_attr, inherited_attr ] )
+    c['attr_val'] = attr_val
+    c['attr_val'] = c['first_object'].get_attribute_tuple()
+    m.append( "id=%s" % c['first_object'].get_id())
+    c['first_object'].id = c['first_object'].get_id()
+    return render_to_response('objectbrowser/view_object.html', c)
 
 def get_contact(request, contact_name=None):
@@ -72 +115 @@
     c['attributes'] = {}
     return render_to_response('configurator/contact.html', c)
+
 def get_host(request, host_name):
         pass

adagios/templates/objectbrowser/list_objects.html

@@ -1 +1 @@
 
 
-{% block title %}Showing {{ object_type }}{% endblock %}
+{% block title %}{{ object_type }}{% endblock %}
 
 {% block content %}
@@ -19 +19 @@
         {% for o in objects %}
                 <tr>
-                        <td><a href="{{ o.object_type }}/{{ o.name }}">{{ o.name }} </a></td>
+                        <td><a href="{{ o.object_type }}/id={{ o.id }}">{{ o.name }} </a></td>
                         <td>{{ o.object_type }}</td>
                         <td>{{ o.use }}</td>

adagios/templates/objectbrowser/view_object.html

@@ -1 @@
-{% extends "configurator/base.html" %}
 
-{% block title %}c.object_type{% endblock %}
+
+{% block title %}{{ object_type }}{% endblock %}
 
 {% block content %}
@@ -14 +14 @@
 {% endif %}
 
-{% if contact %}
-<h1>{{ contact.contact_name }}</h1>
-        <table border=1>
-        {% for key,value in not_template.items %}
-                <tr><td>{{ key }}</td><td>{{ value }} </td></tr>
-        {% endfor %}
-        </table>
-<pre>
-Attributes from template:
-<table border=1>
-        {% for key,value in template.items %}
-                <tr><td>{{ key }}</td><td>{{ value }} </td></tr>
-        {% endfor %}
-        </table>
 
-</pre>
-
+{% if first_object %}
+<!--
+{{ first_object }}
+-->
+id={{ first_object.id }}
+        <table border=1>
+        <tr><th>Attribute Name</th><th>Defined Value</th><th>Inherited Value</th></tr>
+        {{ first_object.data }}
+        {% for attr in attr_val %}
+                <tr>
+                        <td>{{ attr.0 }}</td><td>{{ attr.1 }}</td><td> {{attr.2}}</td>
+                </tr>
+        {% endfor %} 
+        
 {% else %}
-        <p>{{ c.object_type }} not found. </p>
+        <p>No objects found. </p>
 {% endif %}