Improved sql queries.

see #392
This commit is contained in:
Antoine Nguyen
2013-04-19 17:08:53 +02:00
parent 69e99e5d83
commit a262a9bd9e
2 changed files with 16 additions and 14 deletions
+10
View File
@@ -1,11 +1,21 @@
from django.db import models
from django.contrib.auth.models import User
class Parameter(models.Model):
name = models.CharField(max_length=255)
value = models.CharField(max_length=255)
@property
def shortname(self):
return self.name.split(".")[1].lower()
class UserParameter(models.Model):
user = models.ForeignKey("auth.User")
name = models.CharField(max_length=255)
value = models.CharField(max_length=255)
@property
def shortname(self):
return self.name.split(".")[1].lower()
+6 -14
View File
@@ -72,13 +72,9 @@ class AdminParametersForm(GenericParametersForm):
def _load_initial_values(self):
from models import Parameter
for name in self.fields.keys():
fullname = "%s.%s" % (self.app, name.upper())
try:
p = Parameter.objects.get(name=fullname)
except Parameter.DoesNotExist:
continue
self.fields[name].initial = p.value
names = ["%s.%s" % (self.app, name.upper()) for name in self.fields.keys()]
for p in Parameter.objects.filter(name__in=names):
self.fields[p.shortname].initial = p.value
def save(self):
from models import Parameter
@@ -117,13 +113,9 @@ class UserParametersForm(GenericParametersForm):
return
from models import UserParameter
for name in self.fields.keys():
fullname = "%s.%s" % (self.app, name.upper())
try:
p = UserParameter.objects.get(user=self.user, name=fullname)
except UserParameter.DoesNotExist:
continue
self.fields[name].initial = p.value
names = ["%s.%s" % (self.app, name.upper()) for name in self.fields.keys()]
for p in UserParameter.objects.filter(user=self.user, name__in=names):
self.fields[p.shortname].initial = p.value
@staticmethod
def has_access(user):