Skip to content

Commit 32781eb

Browse files
suhailnadaf509suhailnadaf509
committed
Revert "Fixes issue fossasia#516"
This reverts commit c07fc5a.
1 parent c07fc5a commit 32781eb

File tree

4 files changed

+125
-195
lines changed

4 files changed

+125
-195
lines changed

‎src/pretix/eventyay_common/static/eventyay-common/js/ui/dashboard.js

-37
This file was deleted.

‎src/pretix/eventyay_common/templates/eventyay_common/dashboard/dashboard.html

+123-136
Original file line numberDiff line numberDiff line change
@@ -1,143 +1,130 @@
1-
{% extends "eventyay_common/base.html" %} {% load i18n %} {% block title %}{%
2-
trans "Dashboard" %} {% endblock %} {% block content %}
3-
<h1>{% trans "Dashboard" %}</h1>
4-
<div class="dropdown-container">
5-
<input
6-
type="text"
7-
class="form-control"
8-
id="dashboard_query"
9-
placeholder="{% trans 'Go to event' %}"
10-
autofocus
11-
/>
12-
</div>
13-
<h2>{% trans "Your upcoming events" %}</h2>
14-
<div class="dashboard">
15-
{% if can_create_event %}
16-
<div class="widget-small widget-container">
17-
<a href="{% url 'eventyay_common:events.add' %}" class="widget">
18-
<div class="newevent">
19-
<span class="fa fa-plus-circle"></span>{% trans "Create a new event" %}
20-
</div>
21-
</a>
22-
</div>
23-
{% endif %} {% for w in upcoming %}
24-
<div
25-
class="widget-{{ w.display_size|default:'small' }} {{ w.container_class|default:'widget-container' }} {% if w.lazy %}widget-lazy-loading{% endif %}"
26-
data-lazy-id="{{ w.lazy }}"
27-
>
28-
<div class="widget">
29-
{% if w.lazy %}
30-
<span class="fa fa-cog fa-4x"></span>
31-
{% else %} {{ w.content|safe }} {% endif %}
32-
</div>
33-
</div>
34-
{% endfor %}
35-
</div>
36-
{% if upcoming %}
37-
<p class="">
38-
<a
39-
href="{% url 'eventyay_common:events' %}?ordering=date_from&status=date_future"
40-
class=""
41-
>
42-
{% trans "View all upcoming events" %}
43-
</a>
44-
</p>
45-
{% endif %} {% if past %}
46-
<h2>{% trans "Your most recent events" %}</h2>
47-
<div class="dashboard">
48-
{% for w in past %}
49-
<div
50-
class="widget-{{ w.display_size|default:'small' }} {{ w.container_class|default:'widget-container' }} {% if w.lazy %}widget-lazy-loading{% endif %}"
51-
data-lazy-id="{{ w.lazy }}"
52-
>
53-
<div class="widget">
54-
{% if w.lazy %}
55-
<span class="fa fa-cog fa-4x"></span>
56-
{% else %} {{ w.content|safe }} {% endif %}
57-
</div>
58-
</div>
59-
{% endfor %}
60-
</div>
61-
<p>
62-
<a
63-
href="{% url 'eventyay_common:events' %}?ordering=date_from&status=-date_to"
64-
class=""
65-
>
66-
{% trans "View all recent events" %}
67-
</a>
68-
</p>
69-
{% endif %} {% if series %}
70-
<h2>{% trans "Your event series" %}</h2>
71-
<div class="dashboard">
72-
{% for w in series %}
73-
<div
74-
class="widget-{{ w.display_size|default:'small' }} {{ w.container_class|default:'widget-container' }} {% if w.lazy %}widget-lazy-loading{% endif %}"
75-
data-lazy-id="{{ w.lazy }}"
76-
>
77-
<div class="widget">
78-
{% if w.lazy %}
79-
<span class="fa fa-cog fa-4x"></span>
80-
{% else %} {{ w.content|safe }} {% endif %}
1+
{% extends "eventyay_common/base.html" %}
2+
{% load i18n %}
3+
{% block title %}{% trans "Dashboard" %}
4+
{% endblock %}
5+
{% block content %}
6+
<h1>{% trans "Dashboard" %}</h1>
7+
<div class="dropdown-container">
8+
<input type="text" class="form-control" id="dashboard_query"
9+
placeholder="{% trans 'Go to event' %}"
10+
data-typeahead-query autofocus>
11+
<ul data-event-typeahead data-source="{% url 'control:nav.typeahead' %}" data-typeahead-field="#dashboard_query"
12+
class="event-dropdown dropdown-menu">
13+
</ul>
8114
</div>
82-
</div>
83-
{% endfor %}
84-
</div>
85-
<p class="">
86-
<a
87-
href="{% url 'eventyay_common:events' %}?ordering=-date_to&status=series"
88-
class=""
89-
>
90-
{% trans "View all event series" %}
91-
</a>
92-
</p>
93-
{% endif %} {% if widgets %}
94-
<h2>{% trans "Other features" %}</h2>
95-
<div class="dashboard">
96-
{% for w in widgets %}
97-
<div
98-
class="widget-{{ w.display_size|default:'small' }} {{ w.container_class|default:'widget-container' }} {% if w.lazy %}widget-lazy-loading{% endif %}"
99-
data-lazy-id="{{ w.lazy }}"
100-
>
101-
{% if w.url %}
102-
<a href="{{ w.url }}" class="widget">
103-
{% if w.lazy %}
104-
<span class="fa fa-cog fa-4x"></span>
105-
{% else %} {{ w.content|safe }} {% endif %}
106-
</a>
107-
{% else %}
108-
<div class="widget">
109-
{% if w.lazy %}
110-
<span class="fa fa-cog fa-4x"></span>
111-
{% else %} {{ w.content|safe }} {% endif %}
15+
<h2>{% trans "Your upcoming events" %}</h2>
16+
<div class="dashboard">
17+
{% if can_create_event %}
18+
<div class="widget-small widget-container">
19+
<a href="{% url 'eventyay_common:events.add' %}" class="widget">
20+
<div class="newevent"><span class="fa fa-plus-circle"></span>{% trans "Create a new event" %}</div>
21+
</a>
22+
</div>
23+
{% endif %}
24+
{% for w in upcoming %}
25+
<div class="widget-{{ w.display_size|default:'small' }} {{ w.container_class|default:'widget-container' }} {% if w.lazy %}widget-lazy-loading{% endif %}" data-lazy-id="{{ w.lazy }}">
26+
<div class="widget">
27+
{% if w.lazy %}
28+
<span class="fa fa-cog fa-4x"></span>
29+
{% else %}
30+
{{ w.content|safe }}
31+
{% endif %}
32+
</div>
33+
</div>
34+
{% endfor %}
11235
</div>
36+
{% if upcoming %}
37+
<p class="">
38+
<a href="{% url 'eventyay_common:events' %}?ordering=date_from&status=date_future" class="">
39+
{% trans "View all upcoming events" %}
40+
</a>
41+
</p>
42+
{% endif %}
43+
{% if past %}
44+
<h2>{% trans "Your most recent events" %}</h2>
45+
<div class="dashboard">
46+
{% for w in past %}
47+
<div class="widget-{{ w.display_size|default:'small' }} {{ w.container_class|default:'widget-container' }} {% if w.lazy %}widget-lazy-loading{% endif %}" data-lazy-id="{{ w.lazy }}">
48+
<div class="widget">
49+
{% if w.lazy %}
50+
<span class="fa fa-cog fa-4x"></span>
51+
{% else %}
52+
{{ w.content|safe }}
53+
{% endif %}
54+
</div>
55+
</div>
56+
{% endfor %}
57+
</div>
58+
<p>
59+
<a href="{% url 'eventyay_common:events' %}?ordering=date_from&status=-date_to" class="">
60+
{% trans "View all recent events" %}
61+
</a>
62+
</p>
63+
{% endif %}
64+
{% if series %}
65+
<h2>{% trans "Your event series" %}</h2>
66+
<div class="dashboard">
67+
{% for w in series %}
68+
<div class="widget-{{ w.display_size|default:'small' }} {{ w.container_class|default:'widget-container' }} {% if w.lazy %}widget-lazy-loading{% endif %}" data-lazy-id="{{ w.lazy }}">
69+
<div class="widget">
70+
{% if w.lazy %}
71+
<span class="fa fa-cog fa-4x"></span>
72+
{% else %}
73+
{{ w.content|safe }}
74+
{% endif %}
75+
</div>
76+
</div>
77+
{% endfor %}
78+
</div>
79+
<p class="">
80+
<a href="{% url 'eventyay_common:events' %}?ordering=-date_to&status=series" class="">
81+
{% trans "View all event series" %}
82+
</a>
83+
</p>
84+
{% endif %}
85+
{% if widgets %}
86+
<h2>{% trans "Other features" %}</h2>
87+
<div class="dashboard">
88+
{% for w in widgets %}
89+
<div class="widget-{{ w.display_size|default:'small' }} {{ w.container_class|default:'widget-container' }} {% if w.lazy %}widget-lazy-loading{% endif %}" data-lazy-id="{{ w.lazy }}">
90+
{% if w.url %}
91+
<a href="{{ w.url }}" class="widget">
92+
{% if w.lazy %}
93+
<span class="fa fa-cog fa-4x"></span>
94+
{% else %}
95+
{{ w.content|safe }}
96+
{% endif %}
97+
</a>
98+
{% else %}
99+
<div class="widget">
100+
{% if w.lazy %}
101+
<span class="fa fa-cog fa-4x"></span>
102+
{% else %}
103+
{{ w.content|safe }}
104+
{% endif %}
105+
</div>
106+
{% endif %}
107+
</div>
108+
{% endfor %}
109+
</div>
113110
{% endif %}
114-
</div>
115-
{% endfor %}
116-
</div>
117-
{% endif %}
118111

119-
<div class="modal popup-modal" id="alert-modal" tabindex="-1" role="dialog">
120-
<div class="modal-dialog" role="document">
121-
<div class="modal-content">
122-
<div class="modal-body">
123-
<div class="modal-card">
124-
<div class="modal-card-icon">
125-
<i class="fa fa-cog big-rotating-icon"></i>
126-
</div>
127-
<div class="modal-card-content">
128-
<h3>{% trans "Component not enabled!" %}</h3>
129-
<p>{% trans "You need to enable this component first" %}</p>
130-
<button
131-
type="button"
132-
class="btn btn-secondary"
133-
data-dismiss="modal"
134-
>
135-
{% trans "Ok" %}
136-
</button>
137-
</div>
112+
<div class="modal popup-modal" id="alert-modal" tabindex="-1" role="dialog">
113+
<div class="modal-dialog" role="document">
114+
<div class="modal-content">
115+
<div class="modal-body">
116+
<div class="modal-card">
117+
<div class="modal-card-icon">
118+
<i class="fa fa-cog big-rotating-icon"></i>
119+
</div>
120+
<div class="modal-card-content">
121+
<h3>{% trans "Component not enabled!" %}</h3>
122+
<p>{% trans "You need to enable this component first" %}</p>
123+
<button type="button" class="btn btn-secondary" data-dismiss="modal">{% trans "Ok" %}</button>
124+
</div>
125+
</div>
126+
</div>
127+
</div>
138128
</div>
139-
</div>
140129
</div>
141-
</div>
142-
</div>
143130
{% endblock %}

‎src/pretix/eventyay_common/urls.py

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
url(r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/delete$', team.TeamDeleteView.as_view(),
2020
name='organizer.team.delete'),
2121
url(r'^events/$', event.EventList.as_view(), name='events'),
22-
url(r'^events/search/$', event.EventSearchView.as_view(), name='events.search'),
2322
url(r'^events/add$', event.EventCreateView.as_view(), name='events.add'),
2423
url(r'^event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include([
2524
url(r'^$', dashboards.EventIndexView.as_view(), name='event.index'),

‎src/pretix/eventyay_common/views/event.py

+2-21
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
from django.contrib import messages
88
from django.core.exceptions import PermissionDenied
99
from django.db import transaction
10-
from django.db.models import F, Max, Min, Prefetch, Q
10+
from django.db.models import F, Max, Min, Prefetch
1111
from django.db.models.functions import Coalesce, Greatest
12-
from django.http import HttpRequest, HttpResponseRedirect, JsonResponse
12+
from django.http import HttpRequest, HttpResponseRedirect
1313
from django.shortcuts import redirect
1414
from django.urls import reverse
1515
from django.utils.functional import cached_property
@@ -511,22 +511,3 @@ def generate_token_url(self, request):
511511
)
512512
base_url = self.request.event.settings.venueless_url
513513
return "{}/#token={}".format(base_url, token).replace("//#", "/#")
514-
515-
516-
class EventSearchView(views.APIView):
517-
def get(self, request):
518-
query = request.GET.get('query', '')
519-
events = Event.objects.filter(
520-
Q(name__icontains=query) | Q(slug__icontains=query)
521-
).select_related('organizer')[:10]
522-
523-
results = []
524-
for event in events:
525-
if request.user.has_event_permission(event.organizer, event, 'can_view_orders', request=request):
526-
results.append({
527-
'name': event.name,
528-
'slug': event.slug,
529-
'organizer': event.organizer.slug
530-
})
531-
532-
return JsonResponse(results, safe=False)

0 commit comments

Comments
 (0)