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 2012/09/17 18:22:55 UTC
svn commit: r1386692 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js:
archiva/main.js redback/user.js
Author: olamy
Date: Mon Sep 17 16:22:55 2012
New Revision: 1386692
URL: http://svn.apache.org/viewvc?rev=1386692&view=rev
Log:
fix welcome page to display warning on missing admin
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1386692&r1=1386691&r2=1386692&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Mon Sep 17 16:22:55 2012
@@ -52,8 +52,7 @@ function(jquery,ui,sammy,tmpl) {
url: 'restServices/redbackServices/loginService/logout',
complete: function(){
// go to welcome on logout
- window.sammyArchivaApplication.runRoute('get', '#search')
- window.sammyArchivaApplication.setLocation("#welcome");
+ window.sammyArchivaApplication.setLocation("#search");
}
});
@@ -601,17 +600,25 @@ function(jquery,ui,sammy,tmpl) {
$.log("repositoryId:"+repositoryId);
displayBrowse(true,repositoryId);
});
+
+ this.get('#welcome', function () {
+ $.log("#welcome hash");
+ checkCreateAdminLink(function(){window.sammyArchivaApplication.setLocation("#search")});
+
+ });
+
this.get('#:folder', function () {
var folder = this.params.folder;
self.activeMenuId(folder);
var baseItems = self.artifactMenuItems?self.artifactMenuItems:[];
ko.utils.arrayFirst(baseItems.concat(self.usersMenuItems, self.administrationMenuItems), function(p) {
if ( p.href == "#"+self.activeMenuId()) {
+ screenChange();
p.func();
}
});
});
- this.get('#welcome', function () { this.app.runRoute('get', '#search') });
+
});
};
@@ -677,7 +684,7 @@ function(jquery,ui,sammy,tmpl) {
var matches = window.location.toString().match(/^[^#]*(#.+)$/);
var hash = matches ? matches[1] : '';
$.log("location:"+window.sammyArchivaApplication.getLocation()+",hash:"+hash);
- // by default display search screen
+ // by default display welcome screen
if(!hash){
window.sammyArchivaApplication.setLocation("#welcome");
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js?rev=1386692&r1=1386691&r2=1386692&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js Mon Sep 17 16:22:55 2012
@@ -136,6 +136,7 @@ define("redback.user",["jquery","utils",
displaySuccessMessage( $.i18n.prop("user.admin.created"));
var onSuccessCall=function(){
reccordLoginCookie(currentAdminUser);
+ window.archivaModel.adminExists=true;
screenChange();
checkCreateAdminLink();
checkSecurityLinks();
@@ -261,6 +262,7 @@ define("redback.user",["jquery","utils",
return;
}
self.user.createAdmin();
+
// go to search when admin created
window.sammyArchivaApplication.setLocation("#search");
}