From bd8cf29f8c2f0c8298e7bf324f865bd7aab722b3 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 8 Oct 2012 13:52:40 +0200 Subject: - download-link - don't catch exception - unlock in finally --- meetingtools/apps/cluster/models.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'meetingtools/apps/cluster/models.py') diff --git a/meetingtools/apps/cluster/models.py b/meetingtools/apps/cluster/models.py index 3c65d57..592b384 100644 --- a/meetingtools/apps/cluster/models.py +++ b/meetingtools/apps/cluster/models.py @@ -16,13 +16,16 @@ class ACCluster(models.Model): name = CharField(max_length=128,blank=True,unique=True) default_template_sco_id = IntegerField(blank=True,unique=True) domain_match = TextField() - + def __unicode__(self): return self.url - + def make_url(self,path=""): return "%s%s" % (self.url,path) - + + def make_dl_url(self,path=""): + return "%s%s/output/%s.zip?download=zip" % (self,path.strip("/"),path.strip("/")) + def acc_for_user(user): (local,domain) = user.username.split('@') if not domain: -- cgit v1.1