]> git.parisson.com Git - teleforma.git/commitdiff
fix personal profile
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 21 Jul 2014 12:25:22 +0000 (14:25 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 21 Jul 2014 12:25:22 +0000 (14:25 +0200)
teleforma/exam/models.py
teleforma/templates/telemeta/profile_detail.html

index bffe4e4098d04f1f308343a00e26414a512b9adc..e491b03da4daf810a1134dd2d6494a1db0b5b195 100644 (file)
@@ -309,6 +309,11 @@ class Script(BaseResource):
         n = 30
         s = 6
 
+        # self.url = 'http://teleforma.parisson.com/media/scripts/2014/06/24/Gstreamer_monitoring_Pipleline.pdf'
+        self.url = settings.MEDIA_URL + unicode(self.file)
+        self.box_uuid = crocodoc.document.upload(url=self.url)
+        self.date_submitted = datetime.datetime.now()
+
         while True:
             statuses = crocodoc.document.status([self.box_uuid,])
             if (len(statuses) != 0):
@@ -355,10 +360,6 @@ class Script(BaseResource):
         if not self.status == 0 and self.file:
             if not self.box_uuid:
                 self.fix_filename()
-                # self.url = 'http://teleforma.parisson.com/media/scripts/2014/06/24/Gstreamer_monitoring_Pipleline.pdf'
-                self.url = settings.MEDIA_URL + unicode(self.file)
-                self.box_uuid = crocodoc.document.upload(url=self.url)
-                self.date_submitted = datetime.datetime.now()
                 self.box_upload()
                 if not self.corrector and self.t == 1:
                     self.auto_set_corrector()
index 20bc719316c56620460404e25943d68cd4edc872..624523edb51166d077952533d069b7a3447e1700 100644 (file)
@@ -72,7 +72,7 @@
         <dt>{% trans "Options"%}</dt><dd>{{ usr.student.get.options }}</dd>
       {% endif %}
 
-      {% if user.is_staff or user.is_superuser %}
+      {% if user.is_staff or user.is_superuser or usr == user %}
       <dt>{% trans "Email" %}</dt><dd>{{ usr.email }}</dd>
       <dt>{% trans "Address" %}</dt><dd>{{ usr.profile.get.address }} {{ usr.profile.get.postal_code }} {{ usr.profile.get.city }}</dd>
       <dt>{% trans "Telephone" %}</dt><dd>{{ usr.profile.get.telephone }}</dd>