Changeset f116422

Timestamp:

05/29/11 23:06:01 (2 years ago)

Author:

Pall Sigurdsson <palli@…>

Branches:

master

Children:

69e8ce1

Parents:

582de6e

git-author:

Pall Sigurdsson <palli@…> (05/29/11 23:06:01)

git-committer:

Pall Sigurdsson <palli@…> (05/29/11 23:06:01)

Message:

Refactoring and bugfixes.

Location:

adagios

Files:

• objectbrowser/urls.py (modified) (1 diff)
• objectbrowser/views.py (modified) (6 diffs)
• templates/configurator/base.html (modified) (1 diff)

adagios/objectbrowser/urls.py

@@ -3 +3 @@
 
 urlpatterns = patterns('',
-    # Example:
-    #(r'^/', 'objectbrowser.views.index'),
-    #(r'^/host', 'objectbrowser.views.list_hosts'),
-    #(r'^/host/(?P<host_name>.+)$', 'objectbrowser.views.get_host'),
-    
-    #(r'/contact/+$', 'objectbrowser.views.list_contacts'),
     (r'/id=(?P<object_id>.+)$', 'objectbrowser.views.view_object'),
+
     (r'/(?P<attribute_name>.+)=(?P<attribute_value>.+?)/(?P<attribute2_name>.+)=(?P<attribute2_value>.+?)/(?P<attribute3_name>.+)=(?P<attribute3_value>.+?)/?$', 'objectbrowser.views.list_objects'),
-    #(r'/(?P<attribute_name>.+)=(?P<attribute_value>.+?)$', 'objectbrowser.views.list_objects'),
-    (r'/(?P<attribute_name>.+)=(?P<attribute_value>.+?)/(?P<attribute2_name>.+)=(?P<attribute2_value>.+?)$', 'objectbrowser.views.list_objects'),
+    (r'/(?P<attribute_name>.+)=(?P<attribute_value>.+?)/(?P<attribute2_name>.+)=(?P<attribute2_value>.+?)/?$', 'objectbrowser.views.list_objects'),
     (r'/(?P<attribute_name>.+)=(?P<attribute_value>.+?)/?$', 'objectbrowser.views.list_objects'),
 
+    # By default, lets just display a list of object_types available
     (r'/$', 'objectbrowser.views.list_object_types'),
+    # 
     (r'/(?P<object_type>.+)/?$', 'objectbrowser.views.list_objects'),
     

adagios/objectbrowser/views.py

@@ +1 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2010, Pall Sigurdsson <palli@opensource.is>
+#
+# This script is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This script is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 from django.shortcuts import render_to_response, redirect
 from django.core import serializers
@@ -20 +37 @@
         return list_hosts(request)
 
+## DEPRECATED for list_objects
 def list_hosts(request):
         c = {}
         c['hosts'] = Host.objects.all
         return render_to_response('configurator/index.html', c)
-
+## Deprecated for list_objects
 def list_contacts(request):
         c = {}
@@ -36 +54 @@
     c['objects'] = objects = []
     
-    if attribute_name=='object_type':
-        object_type=attribute_value
+    search = tmp = {}
+    if attribute_name != None:
+        search = {attribute_name:attribute_value}
+    if attribute2_name != None:
+        search[attribute2_name]=attribute2_value
+    if attribute3_name != None:
+        search[attribute3_name]=attribute3_value
+    
+    for k,v in search.items():
+        if k == 'object_type':
+            object_type = v
+        elif v == 'None':
+            search[k] = None
     # If a non-existent object_type is requested, lets display a warning
     if not Model.string_to_class.has_key(object_type):
@@ -49 +78 @@
         c['objects'] = myClass.objects.all
     else:
-        if attribute_name != None:
-            tmp = {attribute_name:attribute_value}
-        if attribute2_name != None:
-            tmp[attribute2_name]=attribute2_value
-        if attribute3_name != None:
-            tmp[attribute3_name]=attribute3_value
-
-        c['objects'] = myClass.objects.filter(**tmp)
-        m.append("I used the filter %s=%s" % (tmp.keys(), tmp.values()))
+        c['objects'] = myClass.objects.filter(**search)
+        m.append("I used the filter %s=%s" % (search.keys(), search.values()))
     m.append( "Found %s objects of type %s" % (len(c['objects']), object_type))
     return render_to_response('objectbrowser/list_objects.html', c)
@@ -64 +86 @@
     c = {}
     c['object_types'] = t = []
-    for i in Model.string_to_class.keys():
-        t.append( i )
+    for name,Class in Model.string_to_class.items():
+        if name != None:
+            active = inactive = 0
+            all_instances = Class.objects.all
+            for i in all_instances:
+                if i['register'] == "0":
+                    inactive += 1
+                else:
+                    active += 1
+            c['object_types'].append( (name, active, inactive) )
     return render_to_response('objectbrowser/list_object_types.html', c)
 
@@ -72 +102 @@
     c['messages'] = m = []
     o = ObjectDefinition.objects.filter(id=object_id)[0]
+    #o = ObjectDefinition.objects.get_by_id(id=object_id)
     c['my_object'] = o
     c['attr_val'] = o.get_attribute_tuple()
     return render_to_response('objectbrowser/view_object.html', c)
 
-def get_services_without_service_description(self):
-    c = {}
-    s = Service.objects.filter(register=1, service_description=None)
-    return render_to_response('objectbrowser/list_objects.html', c)
-
-def get_services_without_host_name(self):
-    c = {}
-    s = Service.objects.filter(register=1, host_name=None)
-    return render_to_response('objectbrowser/list_objects.html', c)
 
 

adagios/templates/configurator/base.html

@@ -38 +38 @@
         Cool Searches:
         <ul>
-                        <li><a href="/objectbrowser/">Services With no service_description</a></li>
-                <li><a href="/objectbrowser/host">Services With no host_name</a></li>
+                        <li><a href="/objectbrowser/object_type=service/register=1/service_description=None">Services With no service_description</a></li>
+                <li><a href="/objectbrowser/object_type=service/register=1/host_name=None">Services With no host_name</a></li>
                         <li><a href="/objectbrowser/contact">Services that are not okconfig compatible</a></li>
         </ul>