Просмотр исходного кода

Merge branch 'master' into sk-biber-errors

Shane Kilkelly 10 лет назад
Родитель
Сommit
6911de1149

+ 1 - 1
services/web/app/views/project/editor/share.jade

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

+ 2 - 1
services/web/public/coffee/main/universties-site.coffee

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