Skip to content

Commit

Permalink
Gate system (#449) (#450)
Browse files Browse the repository at this point in the history
* Gate system (#449)

* Update package.json

* Update drupal_ticket_sync.js

* version bump v2.8.6

* Allow exit

* V2.8.8

* fix lint

* Update package.json

* Gate Web UI fixes

* v2.9.0
  • Loading branch information
LeonFedotov authored May 28, 2017
1 parent 1960bf6 commit fe288ca
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"this is part of the deployment proess, so it is important to update the version number",
"version name corresponds to the github release name / tag name - https://github.com/Midburn/Spark/releases"
],
"version": "2.8.9",
"version": "2.9.0",
"private": true,
"scripts": {
"postinstall": "bower install",
Expand Down
2 changes: 1 addition & 1 deletion routes/gate_routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ router.get('/ajax/tickets', [security.protectJwt, userRole.isGateManager()], asy

let searchRegex = req.query.search.trim().replace(' ', '|');

knex.select('*')
knex.select('tickets.*', 'users.*', 'users_groups.name')
.from('tickets')
.leftJoin('users', 'tickets.holder_id', 'users.user_id')
.leftJoin('users_groups', 'tickets.entrance_group_id', 'users_groups.group_id')
Expand Down
10 changes: 10 additions & 0 deletions views/pages/gate.jade
Original file line number Diff line number Diff line change
Expand Up @@ -234,4 +234,14 @@ block scripts
$("#alerts")[0].innerHTML = "<div class='alert alert-danger'>" + JSON.parse(xhr.responseText).message + "</div>";
});
}

$("#myModal").on('hide.bs.modal', function() {
$("#modal_mode")[0].innerHTML = "";
$("#modal_barcode")[0].innerHTML = "";
$("#modal_ticket_number")[0].innerHTML = "";
$("#modal_name")[0].innerHTML = "";
$("#modal_email")[0].innerHTML = "";
$("#modal_type")[0].innerHTML = "";
$("#modal_israeli_id")[0].innerHTML = "";
});
});

0 comments on commit fe288ca

Please sign in to comment.