diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js
index bf9f449f..0acb65a8 100755
--- a/app/controllers/users/users.authentication.server.controller.js
+++ b/app/controllers/users/users.authentication.server.controller.js
@@ -61,8 +61,13 @@ config_nev();
exports.validateVerificationToken = function(req, res){
nev.confirmTempUser(req.params.token, function(err, user) {
+ //FIXME: Quick hack to prevent already verified users from seeing link has expired page
+ if(errorHandler.getErrorMessage(err) === "Unique field already exists") {
+ return res.status(200).send('User successfully verified');
+ }
+
if(err) {
- return res.status(500).send( {message: errorHandler.getErrorMessage(err) } );
+ return res.status(500).send( {message: errorHandler.getErrorMessage(err) } );
}
else if (user){
return res.status(200).send('User successfully verified');
diff --git a/public/dist/application.js b/public/dist/application.js
index 604f6801..deeab753 100644
--- a/public/dist/application.js
+++ b/public/dist/application.js
@@ -61,6 +61,619 @@ angular.element(document).ready(function() {
angular.bootstrap(document, [ApplicationConfiguration.applicationModuleName]);
});
+angular.module('TellForm.templates', []).run(['$templateCache', function($templateCache) {
+ "use strict";
+ $templateCache.put("modules/core/views/header.client.view.html",
+ "
# | {{value.title}} | {{ 'PERCENTAGE_COMPLETE' | translate }} | {{ 'TIME_ELAPSED' | translate }} | {{ 'DEVICE' | translate }} | {{ 'LOCATION' | translate }} | {{ 'IP_ADDRESS' | translate }} | {{ 'DATE_SUBMITTED' | translate }} (UTC) | |
---|---|---|---|---|---|---|---|---|
{{$index+1}} | {{field.fieldValue}} | {{row.percentageComplete}}% | {{row.timeElapsed | secondsToDateTime | date:'mm:ss'}} | {{row.device.name}}, {{row.device.type}} | {{row.geoLocation.City}}, {{row.geoLocation.Country}} | {{row.ipAddr}} | {{row.created | date:'yyyy-MM-dd HH:mm:ss'}} |
{{pageData.introParagraph}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{myform.startPage.introParagraph}}
{{myform.endPage.paragraph}}
{{ 'BEFORE_YOU_CONTINUE' | translate }} polydaic@gmail.com
{{ 'CHECK_YOUR_EMAIL' | translate }} polydaic@gmail.com
# | {{value.title}} | {{ 'PERCENTAGE_COMPLETE' | translate }} | {{ 'TIME_ELAPSED' | translate }} | {{ 'DEVICE' | translate }} | {{ 'LOCATION' | translate }} | {{ 'IP_ADDRESS' | translate }} | {{ 'DATE_SUBMITTED' | translate }} (UTC) | |
---|---|---|---|---|---|---|---|---|
{{$index+1}} | {{field.fieldValue}} | {{row.percentageComplete}}% | {{row.timeElapsed | secondsToDateTime | date:'mm:ss'}} | {{row.device.name}}, {{row.device.type}} | {{row.geoLocation.City}}, {{row.geoLocation.Country}} | {{row.ipAddr}} | {{row.created | date:'yyyy-MM-dd HH:mm:ss'}} |
{{pageData.introParagraph}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{myform.startPage.introParagraph}}
{{myform.endPage.paragraph}}
{{ \'BEFORE_YOU_CONTINUE\' | translate }} polydaic@gmail.com
{{ \'CHECK_YOUR_EMAIL\' | translate }} polydaic@gmail.com
{{pageData.introParagraph}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{myform.startPage.introParagraph}}
{{myform.endPage.paragraph}}
{{pageData.introParagraph}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{myform.startPage.introParagraph}}
{{myform.endPage.paragraph}}