redirect at ticket creation
This commit is contained in:
parent
bccc0c7b74
commit
0512f09e0c
4 changed files with 15 additions and 9 deletions
|
@ -49,7 +49,7 @@
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr ng-repeat="person in event.persons | splittedFilter:query | registeredFilter | orderBy:personsOrder">
|
<tr ng-repeat="person in (event.persons || []) | splittedFilter:query | registeredFilter | orderBy:personsOrder">
|
||||||
<td class="text-right">{{$index+1}}</td>
|
<td class="text-right">{{$index+1}}</td>
|
||||||
<td>
|
<td>
|
||||||
<span><strong><a ui-sref="person.info({id: person.person_id})"><span class="fa fa-lg fa-user"></span></a> <a ui-sref="event.ticket.edit({id: event._id, ticket_id: person._id})" ng-if="person._id"><span>{{person.name}}</span> <span>{{person.surname}}</span></a></strong></span><span ng-if="!person._id"><span>{{person.name}}</span> <span>{{person.surname}}</span></a></strong></span></span><span ng-if="person.email"> <{{person.email}}></span>
|
<span><strong><a ui-sref="person.info({id: person.person_id})"><span class="fa fa-lg fa-user"></span></a> <a ui-sref="event.ticket.edit({id: event._id, ticket_id: person._id})" ng-if="person._id"><span>{{person.name}}</span> <span>{{person.surname}}</span></a></strong></span><span ng-if="!person._id"><span>{{person.name}}</span> <span>{{person.surname}}</span></a></strong></span></span><span ng-if="person.email"> <{{person.email}}></span>
|
||||||
|
|
2
angular_app/js/controllers.js
vendored
2
angular_app/js/controllers.js
vendored
|
@ -425,7 +425,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
|
||||||
person._id = $state.params.id; // that's the id of the event, not the person.
|
person._id = $state.params.id; // that's the id of the event, not the person.
|
||||||
EventTicket.add(person, function(ticket) {
|
EventTicket.add(person, function(ticket) {
|
||||||
$log.debug(ticket);
|
$log.debug(ticket);
|
||||||
$state.go('event.ticket.edit', {ticket_id: ticket._id});
|
$state.go('event.ticket.edit', {id: $scope.event._id, ticket_id: ticket._id});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
@ -4,12 +4,12 @@
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-7 col-xs-7 vcenter">
|
<div class="col-md-7 col-xs-7 vcenter">
|
||||||
<h1><a ui-sref="event.view({id: event._id})" ng-if="event._id">{{event.title}}</a> - {{'new ticket' | translate}}</h1>
|
<h1><a ui-sref="event.view({id: event._id})" ng-if="event._id">{{event.title}}</a><span ng-if="!ticket._id"> - {{'join this event' | translate}}</span><span ng-if="ticket._id"> - {{'your ticket' | translate}}</span></h1>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="container" ng-if="ticket._id && !ticket.cancelled">
|
<div class="container" ng-if="!ticket.cancelled">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="panel panel-info table-striped top5">
|
<div class="panel panel-info table-striped top5">
|
||||||
|
|
|
@ -89,6 +89,7 @@ class BaseHandler(tornado.web.RequestHandler):
|
||||||
'event:tickets-all|create': True,
|
'event:tickets-all|create': True,
|
||||||
'events|read': True,
|
'events|read': True,
|
||||||
'persons|create': True,
|
'persons|create': True,
|
||||||
|
'person|create': True,
|
||||||
'users|create': True
|
'users|create': True
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -513,9 +514,12 @@ class CollectionHandler(BaseHandler):
|
||||||
:param message: message to send
|
:param message: message to send
|
||||||
:type message: str
|
:type message: str
|
||||||
"""
|
"""
|
||||||
|
try:
|
||||||
ws = yield tornado.websocket.websocket_connect(self.build_ws_url(path))
|
ws = yield tornado.websocket.websocket_connect(self.build_ws_url(path))
|
||||||
ws.write_message(message)
|
ws.write_message(message)
|
||||||
ws.close()
|
ws.close()
|
||||||
|
except Exception, e:
|
||||||
|
self.logger.error('Error yielding WebSocket message: %s', e)
|
||||||
|
|
||||||
|
|
||||||
class PersonsHandler(CollectionHandler):
|
class PersonsHandler(CollectionHandler):
|
||||||
|
@ -615,8 +619,10 @@ class EventsHandler(CollectionHandler):
|
||||||
self._clean_dict(data)
|
self._clean_dict(data)
|
||||||
data['seq'] = self.get_next_seq('event_%s_persons' % id_)
|
data['seq'] = self.get_next_seq('event_%s_persons' % id_)
|
||||||
data['seq_hex'] = '%06X' % data['seq']
|
data['seq_hex'] = '%06X' % data['seq']
|
||||||
doc = self.db.query('events',
|
if person_id is None:
|
||||||
{'_id': id_, 'persons.person_id': person_id})
|
doc = {}
|
||||||
|
else:
|
||||||
|
doc = self.db.query('events', {'_id': id_, 'persons.person_id': person_id})
|
||||||
ret = {'action': 'add', 'person_id': person_id, 'person': data, 'uuid': uuid}
|
ret = {'action': 'add', 'person_id': person_id, 'person': data, 'uuid': uuid}
|
||||||
if '_id' in data:
|
if '_id' in data:
|
||||||
del data['_id']
|
del data['_id']
|
||||||
|
|
Loading…
Reference in a new issue