Switch to using django's settings system almost projectwide.

portnov [2008-06-12 04:39:28]
Switch to using django's settings system almost projectwide.
Filename
mgmt/context.py
mgmt/rights.py
mgmt/views.py
settings.py
diff --git a/mgmt/context.py b/mgmt/context.py
index 1322527..f1e2363 100644
--- a/mgmt/context.py
+++ b/mgmt/context.py
@@ -4,8 +4,7 @@ import sys
 from os.path import dirname
 import re

-sys.path.insert(0,dirname(dirname(dirname(__file__))))
-import settings
+from django.conf import settings
 from hms import hms
 import debug

@@ -35,9 +34,9 @@ def add_blocks(request):
   blocks = {}
   logged = request.user.is_authenticated()
   for blk in hms.generate('block'):
-    if blk.name in settings.show_blocks:
+    if blk.name in settings.SHOW_BLOCKS:
       show = True
-      d = settings.show_blocks[blk.name]
+      d = settings.SHOW_BLOCKS[blk.name]
       hre = d.get('hide',None)
       if hre:
         if re.match(hre,request.path):
diff --git a/mgmt/rights.py b/mgmt/rights.py
index d9294a8..6c9568e 100644
--- a/mgmt/rights.py
+++ b/mgmt/rights.py
@@ -3,15 +3,14 @@ from models import BugState

 from os.path import dirname
 import sys
-sys.path.append(dirname(dirname(__file__)))
-import settings
+from django.conf import settings

 def set_responsible(bug,user):
   bug.responsible = user

 def can_change_bug_state(user,bug,new_state):
-  if (bug.status.id,new_state) in settings.bug_rights:
-    cat = settings.bug_rights[(bug.status.id,new_state)]
+  if (bug.status.id,new_state) in settings.BUG_RIGHTS:
+    cat = settings.BUG_RIGHTS[(bug.status.id,new_state)]
     if cat=='Team':
       return user in bug.project.team.iterator()
     if cat=='Admin':
diff --git a/mgmt/views.py b/mgmt/views.py
index 6a95a7a..86b126f 100644
--- a/mgmt/views.py
+++ b/mgmt/views.py
@@ -15,10 +15,7 @@ from models import *
 from context import add_blocks,debug_messages,add_menu
 from rights import can,possible_changes

-from os.path import dirname
-import sys
-sys.path.append(dirname(dirname(__file__)))
-import settings
+from django.conf import settings

 def render_it(template,dict,request):
   c = RequestContext(request,dict,[add_blocks,add_menu,debug_messages])
diff --git a/settings.py b/settings.py
index ebf5f67..49e3966 100644
--- a/settings.py
+++ b/settings.py
@@ -85,11 +85,11 @@ INSTALLED_APPS = (
     'projects.mgmt',
 )

-show_blocks = dict(
+SHOW_BLOCKS = dict(
     last_comments = dict(),
     login   = dict(hide='/login/$',show_logged=False))

-bug_rights = {
+BUG_RIGHTS = {
   (1,2): 'Team',
   (1,5): 'Admin',
   (2,1): 'Admin',
ViewGit