From 861db98c87a46527ce9b7ed4d274300d500f4e84 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Wed, 1 Jul 2020 04:10:43 +0000
Subject: [PATCH] Revert "Merge branch 'issue#43' into 'master'"
This reverts merge request !15
---
hiboo/models.py | 4 +---
hiboo/profile/admin.py | 2 +-
hiboo/profile/templates/profile_list.html | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/hiboo/models.py b/hiboo/models.py
index 1c25397e..85127d35 100644
--- a/hiboo/models.py
+++ b/hiboo/models.py
@@ -176,15 +176,13 @@ class Profile(db.Model):
ACTIVE = "active"
BLOCKED = "blocked"
DELETED = "deleted"
- REJECTED = "rejected"
STATUSES = {
UNCLAIMED: ("gray", _("unclaimed")),
REQUEST: ("blue", _("requested")),
ACTIVE: ("green", _("active")),
BLOCKED: ("orange", _("blocked")),
- DELETED: ("red", _("deleted")),
- REJECTED: ("orange", _("rejected"))
+ DELETED: ("red", _("deleted"))
}
user_uuid = db.Column(db.String(36), db.ForeignKey(User.uuid))
diff --git a/hiboo/profile/admin.py b/hiboo/profile/admin.py
index a5c47620..1a99cb0d 100644
--- a/hiboo/profile/admin.py
+++ b/hiboo/profile/admin.py
@@ -34,7 +34,7 @@ def details(profile_uuid):
@security.confirmation_required("change the profile status")
@security.admin_required()
def set_status(profile_uuid, status):
- if status not in (models.Profile.ACTIVE, models.Profile.BLOCKED, models.Profile.REJECTED):
+ if status not in (models.Profile.ACTIVE, models.Profile.BLOCKED):
flask.abort(403)
profile = models.Profile.query.get(profile_uuid) or flask.abort(404)
profile.status = status
diff --git a/hiboo/profile/templates/profile_list.html b/hiboo/profile/templates/profile_list.html
index d8d8fa75..08b1e6f9 100644
--- a/hiboo/profile/templates/profile_list.html
+++ b/hiboo/profile/templates/profile_list.html
@@ -49,7 +49,6 @@
<a href="{{ url_for("profile.set_status", profile_uuid=profile.uuid, status="active") }}">{% trans %}Unblock profile{% endtrans %}</a>
{% elif profile.status == "request" %}
<a href="{{ url_for("profile.set_status", profile_uuid=profile.uuid, status="active") }}">{% trans %}Validate profile{% endtrans %}</a>
- <a href="{{ url_for("profile.set_status", profile_uuid=profile.uuid, status="rejected") }}">{% trans %}Rejected profile{% endtrans %}</a>
{% elif profile.status == "unclaimed" %}
<a href="{{ url_for("profile.assign", profile_uuid=profile.uuid) }}">{% trans %}Assign profile{% endtrans %}</a>
{% endif %}
--
GitLab