Merge branch 'master' into sk-biber-errors

This commit is contained in:
Shane Kilkelly 2016-03-08 14:55:19 +00:00
commit 6911de1149
2 changed files with 3 additions and 2 deletions

View file

@ -125,7 +125,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate')
span.text-danger.error(ng-show="state.error") #{translate("generic_something_went_wrong")}
button.btn.btn-primary(
ng-click="done()"
) #{translate("done")}
) #{translate("close")}
script(type="text/ng-template", id="makePublicModalTemplate")
.modal-header

View file

@ -12,12 +12,13 @@ define [
console.log "email not set"
return
$scope.sending = true
ticketNumber = Math.floor((1 + Math.random()) * 0x10000).toString(32)
params =
name: $scope.form.name || $scope.form.email
email: $scope.form.email
labels: $scope.form.source
message: "Please contact me with more details"
subject: $scope.form.subject
subject: $scope.form.subject + " - [#{ticketNumber}]"
about : "#{$scope.form.position || ''} #{$scope.form.university || ''}"
Groove.createTicket params, (err, json)->