diff --git a/forms/event.py b/forms/event.py index f22695a..dd05cb5 100644 --- a/forms/event.py +++ b/forms/event.py @@ -67,7 +67,7 @@ class BaseEventForm(FlaskForm): (int(EventAttendanceMode.mixed), lazy_gettext('EventAttendanceMode.mixed'))]) photo_file = FileField(lazy_gettext('Photo'), validators=[FileAllowed(['jpg', 'jpeg', 'png'], lazy_gettext('Images only!'))]) - rating = RadioField(lazy_gettext('Rating'), default=50, coerce=int, choices=[ + rating = SelectField(lazy_gettext('Rating'), default=50, coerce=int, choices=[ (0,lazy_gettext('0 (Little relevant)')), (10,'1'), (20,'2'), @@ -141,7 +141,7 @@ class ReviewEventForm(FlaskForm): (int(EventRejectionReason.untrustworthy), lazy_gettext('EventRejectionReason.untrustworthy')), (int(EventRejectionReason.illegal), lazy_gettext('EventRejectionReason.illegal'))]) - rating = RadioField(lazy_gettext('Rating'), default=50, coerce=int, choices=[ + rating = SelectField(lazy_gettext('Rating'), default=50, coerce=int, choices=[ (0,lazy_gettext('0 (Little relevant)')), (10,'1'), (20,'2'), diff --git a/models.py b/models.py index 4d0f678..4b1e4b8 100644 --- a/models.py +++ b/models.py @@ -382,6 +382,10 @@ class FeaturedEvent(db.Model, TrackableMixin): rejection_resaon = Column(IntegerEnum(FeaturedEventRejectionReason)) rating = Column(Integer()) + @hybrid_property + def verified(self): + return self.review_status == FeaturedEventReviewStatus.verified + class Event(db.Model, TrackableMixin): __tablename__ = 'event' id = Column(Integer(), primary_key=True) diff --git a/templates/event/create.html b/templates/event/create.html index 9f6c494..0673113 100644 --- a/templates/event/create.html +++ b/templates/event/create.html @@ -139,7 +139,7 @@ $( function() { {{ _('Rating') }}
- {{ render_radio_buttons(form.rating) }} + {{ render_field_with_errors(form.rating) }}
{% endif %} diff --git a/templates/event/review.html b/templates/event/review.html index c835e91..ac98a8a 100644 --- a/templates/event/review.html +++ b/templates/event/review.html @@ -10,25 +10,11 @@
{{ form.hidden_tag() }} -
-
- {{ _('Review') }} -
-
- {{ render_field_with_errors(form.review_status) }} - {{ render_field_with_errors(form.rejection_resaon) }} -
-
+ {{ render_field_with_errors(form.review_status) }} + {{ render_field_with_errors(form.rejection_resaon) }} {% if form.rating.choices|length > 1 %} -
-
- {{ _('Rating') }} -
-
- {{ render_radio_buttons(form.rating) }} -
-
+ {{ render_field_with_errors(form.rating) }} {% endif %} {{ render_field(form.submit) }} diff --git a/templates/event/update.html b/templates/event/update.html index fdfb39c..7326070 100644 --- a/templates/event/update.html +++ b/templates/event/update.html @@ -101,7 +101,7 @@ {{ _('Rating') }}
- {{ render_radio_buttons(form.rating) }} + {{ render_field_with_errors(form.rating) }}
{% endif %}