alberanid/eventman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix #191: limit the amount of transferred data

Browse source
This commit is contained in:
Davide Alberani 2017-12-02 17:32:51 +01:00
parent a48e256530
commit c6d84acbc6
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
angular_app/events-list.html
View file

@ -54,7 +54,7 @@
</div> </div>
</td> </td>
<td ng-if="hasPermission('event:tickets-all|read')" class="hcenter"> <td ng-if="hasPermission('event:tickets-all|read')" class="hcenter">
<p><span ng-init="attendeesNr = ((event.tickets || []) | attendeesFilter).length">{{attendeesNr}}</span> / {{event.tickets_sold || 0}} ({{((attendeesNr / (event.tickets_sold || 0) * 100) || 0).toFixed()}}%)</p> <p><span ng-init="attendeesNr = event.total_attendees || 0">{{attendeesNr}}</span> / {{event.tickets_sold || 0}} ({{((attendeesNr / (event.tickets_sold || 0) * 100) || 0).toFixed()}}%)</p>
</td> </td>
<td class="vtop"> <td class="vtop">
<div ng-if="hasPermission('event:tickets-all|create')" class="top5 hcenter"><button ng-click="$state.go('event.ticket.new', {id: event._id})" ng-class="{min150: true, btn: true, 'btn-success': true, disabled: event.no_tickets_for_sale}" type="button" title="{{'Join this event' | translate}}"><span class="fa fa-user-plus vcenter"></span> {{'Join this event' | translate}}</button></div> <div ng-if="hasPermission('event:tickets-all|create')" class="top5 hcenter"><button ng-click="$state.go('event.ticket.new', {id: event._id})" ng-class="{min150: true, btn: true, 'btn-success': true, disabled: event.no_tickets_for_sale}" type="button" title="{{'Join this event' | translate}}"><span class="fa fa-user-plus vcenter"></span> {{'Join this event' | translate}}</button></div>

6
angular_app/js/controllers.js vendored
View file

@ -78,7 +78,7 @@ eventManControllers.controller('EventsListCtrl', ['$scope', 'Event', 'EventTicke
$scope.filteredLength = 0; $scope.filteredLength = 0;
$scope.maxPaginationSize = 10; $scope.maxPaginationSize = 10;
$scope.events = Event.all(function(events) { $scope.events = Event.all({_summary: true}, function(events) {
if (events && $state.is('tickets')) { if (events && $state.is('tickets')) {
angular.forEach(events, function(evt, idx) { angular.forEach(events, function(evt, idx) {
var evt_tickets = (evt.tickets || []).slice(0); var evt_tickets = (evt.tickets || []).slice(0);
@ -216,7 +216,9 @@ eventManControllers.controller('EventDetailsCtrl', ['$scope', '$state', 'Event',
$scope.eventFormDisabled = false; $scope.eventFormDisabled = false;
if ($state.params.id) { if ($state.params.id) {
$scope.event = Event.get($state.params); var params = angular.copy($state.params);
params['_summary'] = true;
$scope.event = Event.get(params);
if ($state.is('event.view') || !$rootScope.hasPermission('event|update')) { if ($state.is('event.view') || !$rootScope.hasPermission('event|update')) {
$scope.eventFormDisabled = true; $scope.eventFormDisabled = true;
} }

9
eventman_server.py
View file

@ -430,7 +430,8 @@ class CollectionHandler(BaseHandler):
permission = '%s|read' % self.collection permission = '%s|read' % self.collection
if acl and not self.has_permission(permission): if acl and not self.has_permission(permission):
return self.build_error(status=401, message='insufficient permissions: %s' % permission) return self.build_error(status=401, message='insufficient permissions: %s' % permission)
output = {self.collection: self.db.query(self.collection, self.arguments)} db_query = {k: v for k, v in self.arguments.items() if not k.startswith('_')}
output = {self.collection: self.db.query(self.collection, db_query)}
output = self.apply_filter(output, 'get_all') output = self.apply_filter(output, 'get_all')
self.write(output) self.write(output)
@ -625,7 +626,9 @@ class EventsHandler(CollectionHandler):
def _mangle_event(self, event): def _mangle_event(self, event):
# Some in-place changes to an event # Some in-place changes to an event
if 'tickets' in event: if 'tickets' in event:
event['tickets_sold'] = len([t for t in event['tickets'] if not t.get('cancelled')]) valid_tickets = [t for t in event['tickets'] if not t.get('cancelled')]
event['tickets_sold'] = len(valid_tickets)
event['total_attendees'] = len([t for t in valid_tickets if t.get('attended')])
event['no_tickets_for_sale'] = False event['no_tickets_for_sale'] = False
try: try:
self._check_sales_datetime(event) self._check_sales_datetime(event)
@ -634,7 +637,7 @@ class EventsHandler(CollectionHandler):
event['no_tickets_for_sale'] = True event['no_tickets_for_sale'] = True
if not self.has_permission('event|write'): if not self.has_permission('event|write'):
event['group_id'] = '' event['group_id'] = ''
if not self.has_permission('tickets-all|read'): if '_summary' in self.arguments or not self.has_permission('tickets-all|read'):
event['tickets'] = [] event['tickets'] = []
return event return event