Changeset 3493fe in indico

Timestamp:

04/13/12 10:13:39 (14 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

a7600a

Parents:

677f2a

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (04/04/12 11:44:49)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (04/13/12 10:13:39)

Message:

[FIX] Config: use singleton instead

File:

• indico/MaKaC/webinterface/pages/base.py (modified) (2 diffs)

indico/MaKaC/webinterface/pages/base.py

@@ -49 +49 @@
     def _includeJSPackage(self, packageName, module = 'indico', path=None):
         info = HelperMaKaCInfo().getMaKaCInfoInstance()
+        config = Config.getInstance()
 
         if info.isDebugActive():
-            return ['js/%s/%s/Loader.js?%d' % (module, packageName, os.stat('%s/js/%s/%s/Loader.js'%(Config().getHtdocsDir(), module, packageName)).st_mtime )]
-        else:
-            return ['js/%s/pack/%s.js.pack?%d' % (module, packageName, os.stat('%s/js/%s/pack/%s.js.pack'%(Config().getHtdocsDir(),module, packageName)).st_mtime )]
+            return ['js/%s/%s/Loader.js?%d' % (module, packageName, os.stat('%s/js/%s/%s/Loader.js'%(config.getHtdocsDir(), module, packageName)).st_mtime )]
+        else:
+            return ['js/%s/pack/%s.js.pack?%d' % (module, packageName, os.stat('%s/js/%s/pack/%s.js.pack'%(config.getHtdocsDir(),module, packageName)).st_mtime )]
 
     def _includeJQuery(self):
         # TODO: rename this to _includeJSLibs or something similar
         info = HelperMaKaCInfo().getMaKaCInfoInstance()
+        config = Config.getInstance()
 
         files = ['underscore', 'jquery', 'jquery-ui', 'jquery.form', 'jquery.custom',
@@ -64 +66 @@
         if info.isDebugActive():
             # We can't use Loader.js as jQuery is included before any indico js
-            return ['js/jquery/%s.js?%d' % (f, os.stat('%s/js/jquery/%s.js'%(Config().getHtdocsDir(), f)).st_mtime) for f in files]
-        else:
-            return ['js/jquery/pack/jquery.js.pack?%d' % os.stat('%s/js/jquery/pack/jquery.js.pack'%Config().getHtdocsDir()).st_mtime]
+            return ['js/jquery/%s.js?%d' % (f, os.stat('%s/js/jquery/%s.js' % (config.getHtdocsDir(), f)).st_mtime) for f in files]
+        else:
+            return ['js/jquery/pack/jquery.js.pack?%d' % os.stat('%s/js/jquery/pack/jquery.js.pack' % config.getHtdocsDir()).st_mtime]
 
     def _includeJSFile(self, path, filename):
         info = HelperMaKaCInfo().getMaKaCInfoInstance()
+        config = Config.getInstance()
 
         if info.isDebugActive():
-            return ['%s/%s.js?%d' % (path, filename, os.stat('%s/%s/%s.js'%(Config().getHtdocsDir(), path, filename)).st_mtime)]
-        else:
-            return ['%s/%s.js.pack?%d' % (path, filename, os.stat('%s/%s/%s.js.pack'%(Config().getHtdocsDir(),path, filename)).st_mtime)]
+            return ['%s/%s.js?%d' % (path, filename, os.stat('%s/%s/%s.js' % (config.getHtdocsDir(), path, filename)).st_mtime)]
+        else:
+            return ['%s/%s.js.pack?%d' % (path, filename, os.stat('%s/%s/%s.js.pack' % (config.getHtdocsDir(),path, filename)).st_mtime)]
 
     def _includePresentationFiles(self):
         info = HelperMaKaCInfo().getMaKaCInfoInstance()
+        config = Config.getInstance()
 
         if info.isDebugActive():
-            return ['%s?%d' % (f, os.stat('%s/%s'%(Config().getHtdocsDir(), f)).st_mtime) for f in ['js/presentation/Loader.js', 'js/indico/jquery/defaults.js', 'js/indico/jquery/global.js']]
-        else:
-            return ['%s?%d' % (f, os.stat('%s/%s'%(Config().getHtdocsDir(), f)).st_mtime) for f in ['js/presentation/pack/Presentation.js.pack', 'js/indico/jquery/defaults.js', 'js/indico/jquery/global.js']]
+            return ['%s?%d' % (f, os.stat('%s/%s' % (config.getHtdocsDir(), f)).st_mtime) for f in ['js/presentation/Loader.js', 'js/indico/jquery/defaults.js', 'js/indico/jquery/global.js']]
+        else:
+            return ['%s?%d' % (f, os.stat('%s/%s' % (config.getHtdocsDir(), f)).st_mtime) for f in ['js/presentation/pack/Presentation.js.pack', 'js/indico/jquery/defaults.js', 'js/indico/jquery/global.js']]
 
     def _getBaseURL( self ):