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 2014/05/15 07:26:14 UTC
[1/2] git commit: spring 4.0.4
Repository: archiva
Updated Branches:
refs/heads/master 011e7b0ee -> 0a1a105b5
spring 4.0.4
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/4c3ad409
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/4c3ad409
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/4c3ad409
Branch: refs/heads/master
Commit: 4c3ad4099c52eeab3d150df7b1df3d30d6caa0f3
Parents: 011e7b0
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu May 15 15:11:59 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu May 15 15:11:59 2014 +1000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/4c3ad409/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f13c808..4e395d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
<slf4j.version>1.7.7</slf4j.version>
<log4j.version>2.0-rc1</log4j.version>
- <spring.version>4.0.3.RELEASE</spring.version>
+ <spring.version>4.0.4.RELEASE</spring.version>
<javax.jcr.version>2.0</javax.jcr.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
[2/2] git commit: [MRM-1841] "Remember me" not working
Posted by ol...@apache.org.
[MRM-1841] "Remember me" not working
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/0a1a105b
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/0a1a105b
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/0a1a105b
Branch: refs/heads/master
Commit: 0a1a105b50801165b88eb030e9f97adecc0a8ebf
Parents: 4c3ad40
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu May 15 15:25:34 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu May 15 15:25:34 2014 +1000
----------------------------------------------------------------------
.../archiva-webapp/src/main/webapp/js/archiva/main.js | 4 +++-
.../archiva-webapp/src/main/webapp/js/redback/user.js | 4 +++-
.../src/main/webapp/js/templates/redback/login.html | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/0a1a105b/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 c92f10a..6472b68 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
@@ -22,7 +22,7 @@ define("archiva.main",["jquery","jquery.ui","sammy","jquery.tmpl",'i18n',"jquery
function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryValidate,jqueryJson,ko,typeahead) {
/**
- * reccord a cookie for session with the logged user
+ * record a cookie for session with the logged user
* @param user see user.js
*/
reccordLoginCookie=function(user) {
@@ -69,6 +69,8 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa
user.timestampAccountCreation,user.timestampLastLogin,user.timestampLastPasswordChange,user.locked,
user.passwordChangeRequired,null,user.readOnly,user.userManagerId)
+ $.log("user.rememberme:"+user.rememberme);
+
kUser.rememberme(user.rememberme);
return kUser;
};
http://git-wip-us.apache.org/repos/asf/archiva/blob/0a1a105b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
index 6c6a543..b40f528 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js
@@ -429,6 +429,7 @@ function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid,purl) {
}
// FIXME check validated
+ $.log("window.redbackModel.rememberme:"+window.redbackModel.rememberme);
user.rememberme(window.redbackModel.rememberme);
if(user.rememberme()){
user.password(window.redbackModel.password);
@@ -586,7 +587,8 @@ function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid,purl) {
$('#modal-login-footer').append(smallSpinnerImg());
- var rememberme=($("#user-login-form-rememberme" ).attr('checked')=='checked');
+ var rememberme=$('#user-login-form-rememberme').is(':checked');
+ $.log("user.js#login, rememberme:"+rememberme);
window.redbackModel.rememberme=rememberme;
window.redbackModel.password=$("#user-login-form-password").val();
http://git-wip-us.apache.org/repos/asf/archiva/blob/0a1a105b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/login.html
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/login.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/login.html
index 0d8ff84..1f2aba1 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/login.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/login.html
@@ -48,7 +48,7 @@
<div class="modal-footer" id="modal-login-footer">
<div class="pull-left">
<label class="checkbox" id="user-login-form-rememberme-label">
- <input type="checkbox" id="user-login-form-rememberme">${$.i18n.prop('rememberme')}
+ <input type="checkbox" id="user-login-form-rememberme"/>${$.i18n.prop('rememberme')}
</label>
</div>
<button class="btn btn-primary" id="modal-login-ok" data-loading-text="${$.i18n.prop('common.loading')}">