Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion exhibition/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def post(self, request, *args, **kwargs):
class ExhibitorInfoSerializer(I18nAwareModelSerializer):
class Meta:
model = ExhibitorInfo
fields = ('id', 'name', 'description', 'url', 'email', 'logo', 'key', 'lead_scanning_enabled')
fields = ('id', 'name', 'description', 'url', 'email', 'logo', 'key', 'lead_scanning_enabled', 'status')


class ExhibitorInfoViewSet(viewsets.ReadOnlyModelViewSet):
Expand Down
1 change: 1 addition & 0 deletions exhibition/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class Meta:
'allow_voucher_access',
'allow_lead_access',
'lead_scanning_scope_by_device',
'status',
]
labels = {
'name': _('Exhibitor name'),
Expand Down
11 changes: 11 additions & 0 deletions exhibition/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,17 @@ class ExhibitorInfo(models.Model):
)
allow_voucher_access = models.BooleanField(default=False)
allow_lead_access = models.BooleanField(default=False)
STATUS_CHOICES = (
('pending', _('Pending Approval')),
('approved', _('Approved')),
('rejected', _('Rejected')),
)
status = models.CharField(
max_length=20,
choices=STATUS_CHOICES,
default='pending',
verbose_name=_('Status')
)
lead_scanning_scope_by_device = models.BooleanField(default=False)

class Meta:
Expand Down
22 changes: 20 additions & 2 deletions exhibition/templates/exhibitors/add.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ <h1>
</fieldset>

<fieldset>
<legend>{% trans "Internal notes" %}</legend>
{% bootstrap_field form.comment layout="control" %}
<legend>{% trans "Status" %}</legend>
{% bootstrap_field form.status layout="control" %}
</fieldset>

<div class="form-group submit-group">
Expand All @@ -67,4 +67,22 @@ <h1>
</a>
</div>
</form>

<script>
document.addEventListener('DOMContentLoaded', function() {
const form = document.querySelector('form.form-horizontal');
if (form) {
form.addEventListener('submit', function() {
const submitBtn = form.querySelector('button[type="submit"]');
if (submitBtn) {
// Prevent duplicate submission
submitBtn.disabled = true;
// Show loading indicator
const originalText = submitBtn.innerText;
submitBtn.innerHTML = '<i class="fa fa-spinner fa-spin"></i> ' + originalText;
}
});
}
});
</script>
{% endblock %}
7 changes: 6 additions & 1 deletion exhibition/templates/exhibitors/exhibitor_info.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,17 @@ <h1>{% trans "Exhibitors" %}</h1>
{% for e in exhibitors %}
<tr>
<td>
{% if "can_change_event_settings" in request.eventpermset %}
<strong><a href="{% url "plugins:exhibition:edit" organizer=request.event.organizer.slug event=request.event.slug pk=e.id %}">
{{ e.name }}
</a></strong>
<span class="label label-{% if e.status == 'approved' %}success{% elif e.status == 'rejected' %}danger{% else %}warning{% endif %}">
{{ e.get_status_display }}
</span>
{% else %}
<strong>{{ e.name }}</strong>
<span class="label label-{% if e.status == 'approved' %}success{% elif e.status == 'rejected' %}danger{% else %}warning{% endif %}">
{{ e.get_status_display }}
</span>
{% endif %}
</td>
<td class="text-right flip">
Expand Down
1 change: 1 addition & 0 deletions tests/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def test_create_exhibitor_info(event):
exhibitor.logo.name,
)
assert exhibitor.lead_scanning_enabled is True
assert exhibitor.status == "pending"


@pytest.mark.django_db
Expand Down