diff options
| author | Palaparthy Adityachandra | 2021-03-24 17:33:47 +0530 |
|---|---|---|
| committer | GitHub | 2021-03-24 17:33:47 +0530 |
| commit | 9cf0dd7abed0db01a676f731f69c3c63026bc2a3 (patch) | |
| tree | a06ee2c94e07b0f8da7616781a909d6314ec6e20 /yaksh | |
| parent | 2d9cf8d7d8b3f70806a115601d0a89a8a032b1dd (diff) | |
| parent | c6e440f6e04a3fd5fe1e086d300bfc8602562dbf (diff) | |
| download | online_test-9cf0dd7abed0db01a676f731f69c3c63026bc2a3.tar.gz online_test-9cf0dd7abed0db01a676f731f69c3c63026bc2a3.tar.bz2 online_test-9cf0dd7abed0db01a676f731f69c3c63026bc2a3.zip | |
Merge pull request #828 from adityacp/fix_qrcodev0.31.1
Fix in QR code generation
Diffstat (limited to 'yaksh')
| -rw-r--r-- | yaksh/models.py | 6 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/question.html | 8 | ||||
| -rw-r--r-- | yaksh/views.py | 1 |
3 files changed, 5 insertions, 10 deletions
diff --git a/yaksh/models.py b/yaksh/models.py index 8f9f051..aa7c38d 100644 --- a/yaksh/models.py +++ b/yaksh/models.py @@ -3368,8 +3368,10 @@ class QRcode(models.Model): os.makedirs(qr_dir) path = os.path.join(qr_dir, f'{self.short_key}.png') img.save(path) - self.image = os.path.join('qrcode', '{0}.png'.format(self.short_key)) - self.activate() + with open(path, "rb") as qr_file: + django_file = File(qr_file) + self.activate() + self.image.save(os.path.basename(path), django_file, save=True) class QRcodeHandler(models.Model): diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html index f8f0c46..9fe57ed 100644 --- a/yaksh/templates/yaksh/question.html +++ b/yaksh/templates/yaksh/question.html @@ -284,16 +284,10 @@ question_type = "{{ question.type }}"; <br /> <div class="row"> <div class="col-md-8"> - <p>Upload assignment file for the said question. - <br> - <span class="badge badge-primary"> - </u> <strong>You can upload using the file browser below or via the QR code.</strong></u> - </span> - </p> <div class="dropzone needsclick dz-clickable" id="dropzone_file"> <div class="dz-message needsclick"> <button type="button" class="dz-button"> - Drop files here or click to upload. + You can upload using the file browser here or via the QR code. </button> </div> </div> diff --git a/yaksh/views.py b/yaksh/views.py index d2aa319..cad6d82 100644 --- a/yaksh/views.py +++ b/yaksh/views.py @@ -4163,7 +4163,6 @@ def generate_qrcode(request, answerpaper_id, question_id, module_id): reverse("yaksh:upload_file", args=[qrcode.short_key]) ) qrcode.generate_image(content) - qrcode.save() return redirect( reverse( 'yaksh:skip_question', |