[Checkins] SVN: grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/view.py Support setting the lookup URL in UI.

[Uli Fouquet]

Log message for revision 94257:
  Support setting the lookup URL in UI.

Changed:
  U   grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/view.py

-=-
Modified: grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/view.py
===================================================================
--- grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/view.py	2008-12-23 08:47:35 UTC (rev 94256)
+++ grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/view.py	2008-12-23 08:49:13 UTC (rev 94257)
@@ -445,6 +445,12 @@
     grok.require('grok.ManageApplications')
 
     @property
+    def security_notifier_url(self):
+        """Get the URL to look up for security warnings.
+        """
+        return self.security_notifier.lookup_url
+    
+    @property
     def security_notifier(self):
         """Get a local security notifier.
 
@@ -486,14 +492,12 @@
         if messages:
             return messages[0]
 
-    def emitSecurityNotification(self):
-        message = self.secnotes_message
-        self.flash(message)
-        return
-
-    def updateSecurityNotifier(self, setsecnotes=None):
+    def updateSecurityNotifier(self, setsecnotes=None, setsecnotesource=None,
+                               secnotesource=None):
         if self.security_notifier is None:
             return
+        if setsecnotesource is not None:
+            self.security_notifier.setLookupURL(secnotesource)
         if setsecnotes is not None:
             if self.security_notifier.enabled is True:
                 self.security_notifier.disable()
@@ -501,19 +505,21 @@
                 self.security_notifier.enable()
         if self.secnotes_enabled is False:
             return
-        self.emitSecurityNotification()
         return
         
     def update(self, time=None, restart=None, shutdown=None,
-               setsecnotes=None, admin_message=None, submitted=False,
-               dbName="", pack=None, days=0):
+               setsecnotes=None, secnotesource=None, setsecnotesource=None,
+               admin_message=None, submitted=False, dbName="", pack=None,
+               days=0):
 
         # Packing control
         if pack is not None:
             return self.pack(dbName, days)
 
         # Security notification control
-        self.updateSecurityNotifier(setsecnotes)
+        self.updateSecurityNotifier(setsecnotes, setsecnotesource,
+                                    secnotesource)
+
         
         if not submitted:
             return