Changeset 4196

Timestamp:

02/24/09 23:08:10 (4 years ago)

Author:

gpolo

Message:

Fixed ticket #225: Use the i18n version of category names

Location:

branch/NetworkInventory/umitInventory

Files:

• ChangesList.py (modified) (2 diffs)
• TLChangesTree.py (modified) (9 diffs)

branch/NetworkInventory/umitInventory/ChangesList.py

@@ -431 +431 @@
         indx = 0
         for category_id, values in data_dict.items():
-            category = self.invdb.get_category_name_by_id(category_id)
+            db_category = self.invdb.get_category_name_by_id(category_id)
 
             for value in values:
@@ -450 +450 @@
                     states[inv_name] = True
 
-                self.model.append([inv_name, host_addr, category, text,
-                    self.format_date(entry_date)])
+                self.model.append([
+                    inv_name, host_addr, changes_in_db[db_category], text,
+                    self.format_date(entry_date)
+                    ])
 
                 self.row_data[indx] = [new_hostid, old_hostid, indx, inv_name]

branch/NetworkInventory/umitInventory/TLChangesTree.py

@@ -23 +23 @@
 from umitCore.I18N import _
 
+from umitInventory.TLBase import categories
+
 ALLCHANGES = _("View all changes")
 LISTCHANGES = _("Changes listing")
@@ -31 +33 @@
     """
 
-    def __init__(self, connector, datagrabber, categories, inventory,
+    def __init__(self, connector, datagrabber, db_categories, inventory,
         hostaddr):
 
@@ -38 +40 @@
         self.connector = connector
         self.datagrabber = datagrabber
-        self.categories = categories
+        self.db_categories = db_categories
         self.inventory = inventory
         self.hostaddr = hostaddr
@@ -66 +68 @@
         # startup situation
         self.treestore.append(None, [ALLCHANGES])
-        for category in self.categories:
-            self.treestore.append(None, ["%s (0)" % category])
+        for category in self.db_categories:
+            self.treestore.append(None, ["%s (0)" % categories[category]])
 
 
@@ -85 +87 @@
 
             elif len(path) == 2:
-                # clicked on View all changes inside a category
+                # clicked on "View all changes" inside a category
                 category_id = path[0]
                 category_load = { }
@@ -142 +144 @@
         Grabs changes from range_start to range_end and then update tree.
         """
-        categories = self.datagrabber.get_categories()
-        self.categories = [value[1] for key, value in categories.items()]
+        db_categories = self.datagrabber.get_categories()
+        self.db_categories = [value[1] for key, value in db_categories.items()]
 
         data = { }
@@ -149 +151 @@
         # grab changes in timerange
         self.datagrabber.use_dict_cursor()
-        for key in categories.keys():
+        for key in db_categories.keys():
             if not range_start or not range_end:
                 data[key] = { }
@@ -190 +192 @@
 
                 # update clean_data
-                #if clean_data[category].has_key(inventories[fk_inventory]):
                 if inventories[fk_inventory] in clean_data[category]:
                     cdata = clean_data[category][inventories[fk_inventory]]
 
-                    #if cdata.has_key(addresses[fk_address]):
                     if addresses[fk_address] in cdata:
                         cdata[addresses[fk_address]] += 1
@@ -213 +213 @@
         self.treestore.append(None, [ALLCHANGES])
 
-        for indx, item in enumerate(self.categories):
+        for indx, item in enumerate(self.db_categories):
+            # XXX data_length
             data_lenght = len(data[indx + 1]) # keys starting at 1
             changes_sum += data_lenght
 
-            root = self.treestore.append(None, ["%s (%d)" % (item,
+            root = self.treestore.append(None, ["%s (%d)" % (categories[item],
                 data_lenght)])