You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2017/05/10 11:36:00 UTC
archiva git commit: avoid null
Repository: archiva
Updated Branches:
refs/heads/master c2e13264a -> 10b408249
avoid null
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/10b40824
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/10b40824
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/10b40824
Branch: refs/heads/master
Commit: 10b408249ea9d8e2d63054ba95714e3a628ca782
Parents: c2e1326
Author: olivier lamy <ol...@apache.org>
Authored: Wed May 10 21:35:53 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Wed May 10 21:35:53 2017 +1000
----------------------------------------------------------------------
.../src/main/webapp/js/archiva/main.js | 22 +++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/10b40824/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
index 4085d44..c047c2d 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
@@ -861,17 +861,19 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa
};
addValidationTokenHeader=function(user) {
- if (user.validationToken) {
- $.log("Adding validation token "+user.validationToken);
- $.ajaxSetup({
- beforeSend: function (xhr) {
- xhr.setRequestHeader('X-XSRF-TOKEN', user.validationToken);
- }
- });
- } else {
- $.log("No validation token in user object "+user.username+", "+user.validationToken);
+ if(user) {
+ if (user.validationToken) {
+ $.log("Adding validation token "+user.validationToken);
+ $.ajaxSetup({
+ beforeSend: function (xhr) {
+ xhr.setRequestHeader('X-XSRF-TOKEN', user.validationToken);
+ }
+ });
+ } else {
+ $.log("No validation token in user object "+user.username+", "+user.validationToken);
+ }
}
- }
+ };
startArchivaApplication=function(){