Changeset 2 for trac_plugins/logviewer/0.10/logviewer/admin.py

Timestamp:

04/12/06 16:55:54 (3 years ago)

Author:

pacopablo

Message:

• Fixed up the CS template
• Added a bit of CSS
• Refactored a bit of code

Files:

• trac_plugins/logviewer/0.10/logviewer/admin.py (modified) (5 diffs)

trac_plugins/logviewer/0.10/logviewer/admin.py

@@ -22 +22 @@
 from trac.wiki.formatter import wiki_to_html
 from webadmin.web_ui import IAdminPageProvider
+from logviewer.defaults import ADMIN_FIELDS, get_admin_values
 
 import os
@@ -43 +44 @@
     def get_admin_pages(self, req):
         if req.perm.has_permission('LOG_ADMIN'):
-            yield ('logviewer', 'Log Viewer', 'defaults', 'Defaults')
+            yield ('logviewer', 'Log Viewer', 'logdefaults', 'Defaults')
 
     def process_admin_request(self, req, cat, page, path_info):
@@ -53 +54 @@
         req.hdf['logadmin.page'] = page
 
-        admin_fields = {
-                        'log_dir'       : '.',
-                        'log_name_fmt'  : '%Y%m%d.log',
-                        'timestamp_sep' : '|', 
-#                        'post_size'    : 1024,
-#                        'history_days' : 30,
-#                        'new_bot_link' : 'New Blog Post',
-#                        'first_week_day' : 'SUNDAY',
-                       }
+        admin_fields = ADMIN_FIELDS
         if req.method == 'POST':
-            if page == 'defaults':
+            if page == 'logdefaults':
                 for field in admin_fields.keys():
                     self._set_field_value(req, field)
                 self.env.config.save()
-        for field, default in admin_fields.items():
-            self._get_field_value(req, field, default)
+        fields = get_admin_values(self.env.config, 'logviewer')
+        for key, value in fields.items():
+            req.hdf['logadmin.' + key] = value
         req.hdf['logadmin.docs'] = wiki_to_html(self._get_docs(page),
                                                 self.env, req)
@@ -75 +69 @@
     def _get_docs(self, page):
         """Return the wikitext documentation for the page options. """
-        if page == 'defaults':
+        doc = ''
+        if page == 'logdefaults':
             doc = """
  '''Path to the logs directory'''::
@@ -115 +110 @@
         pass
 
-    def _get_field_value(self, req, field_name, default=None):
-        """Get the field from trac.ini and set the hdf appropriately. """
-        field = self.env.config.get('logviewer', field_name) or default
-        req.hdf['logadmin.' + field_name] = field
-        pass
-
     # INavigationContributor
     def get_templates_dirs(self):