Re-add disabled code.

diff --git a/webapp/handlers_base.py b/webapp/handlers_base.py
index 8b0b95d2ed7fb43a691d651c2b8e7d6db32bffd0..618f08f272eee1df98265b570a8ec3e48a13b77d 100644 (file)
--- a/webapp/handlers_base.py
+++ b/webapp/handlers_base.py
@@ -70,7 +70,14 @@ class BaseHandler(tornado.web.RequestHandler):
        def static_url(self, path, static=True):
                ret = tornado.web.RequestHandler.static_url(self, path)
 
-               
+               if self.settings.get("debug", False):
+                       return ret
+
+               elif self.request.host == "admin.ipfire.org":
+                       return ret
+
+               elif static:
+                       return "http://static.ipfire.org%s" % ret
 
                return ret
 

diff --git a/webapp/handlers_stasy.py b/webapp/handlers_stasy.py
index bd0f4e100d92a190a1f1d16bfccda9acb9197104..d384bc57d4eea838bdb5ec144f22da8d45a62b39 100644 (file)
--- a/webapp/handlers_stasy.py
+++ b/webapp/handlers_stasy.py
@@ -3,7 +3,7 @@
 from __future__ import division
 
 import datetime
-#import hwdata
+import hwdata
 import ipaddr
 import logging
 import re
@@ -321,8 +321,8 @@ class StasyStatsVendorDetail(StasyBaseHandler):
        def get(self, bus, vendor_id):
                # XXX some way ugly
                bus2cls = {
-#                      "pci" : hwdata.PCI,
-#                      "usb" : hwdata.USB
+                       "pci" : hwdata.PCI,
+                       "usb" : hwdata.USB
                }
                cls = bus2cls[bus.lower()]
                vendor_name = cls().get_vendor(vendor_id)
@@ -337,8 +337,8 @@ class StasyStatsVendorDetail(StasyBaseHandler):
 class StasyStatsModelDetail(StasyBaseHandler):
        def get(self, bus, vendor_id, model_id):
                bus2cls = {
-#                      "pci" : hwdata.PCI,
-#                      "usb" : hwdata.USB
+                       "pci" : hwdata.PCI,
+                       "usb" : hwdata.USB
                }
                
                cls = bus2cls[bus.lower()]