From 9a3d6c008c302a531865224c5d9ecd5f07e14a5a Mon Sep 17 00:00:00 2001
From: janmax <mail-github@jmx.io>
Date: Wed, 5 Apr 2017 23:53:47 +0200
Subject: [PATCH] Removed last delete button
---
core/models.py | 1 -
core/templates/core/feedback_form.html | 3 ++-
core/templates/core/tutor_startpage.html | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/core/models.py b/core/models.py
index e8de40e4..2999e74f 100644
--- a/core/models.py
+++ b/core/models.py
@@ -224,7 +224,6 @@ class Feedback(models.Model):
Arguments:
user {[type]} -- [description]
"""
- assert Feedback.status != Feedback.ACCEPTED
self.status = Feedback.ACCEPTED
self.of_reviewer = user
self.of_submission.final_feedback = self
diff --git a/core/templates/core/feedback_form.html b/core/templates/core/feedback_form.html
index 68a99f6a..440651fe 100644
--- a/core/templates/core/feedback_form.html
+++ b/core/templates/core/feedback_form.html
@@ -67,7 +67,7 @@
<div class="form-inline">
{# Score field #}
- <div class="input-group col-4 nopadding mr-1">
+ <div class="input-group col-5 nopadding mr-1">
<span class="input-group-addon">Score:</span>
<input
class="form-control"
@@ -83,6 +83,7 @@
</span>
</div>
+ {# status select #}
{% with form.fields.status as status %}
<div class="form-group mr-1">
<select class="custom-select" id="id_status" name="status">
diff --git a/core/templates/core/tutor_startpage.html b/core/templates/core/tutor_startpage.html
index a3f5b859..c235d0a5 100644
--- a/core/templates/core/tutor_startpage.html
+++ b/core/templates/core/tutor_startpage.html
@@ -89,7 +89,6 @@
<a class="btn btn-secondary" href="{% url 'FeedbackEdit' feedback.slug %}"> View </a>
{% else %}
<a class="btn btn-primary" href="{% url 'FeedbackEdit' feedback.slug %}"> Edit </a>
- <a href="{% url 'FeedbackDelete' feedback.slug %}" class="btn btn-primary" name="delete" value="Delete">Delete</a>
{% endif %}
</td>
</tr>
--
GitLab