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/07/12 00:03:29 UTC
svn commit: r1360439 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp:
index.html js/archiva/main.js js/redback/user.js
Author: olamy
Date: Wed Jul 11 22:03:29 2012
New Revision: 1360439
URL: http://svn.apache.org/viewvc?rev=1360439&view=rev
Log:
do not display admin createbox if admin already created
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
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/index.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1360439&r1=1360438&r2=1360439&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html Wed Jul 11 22:03:29 2012
@@ -159,7 +159,6 @@
window.archivaRuntimeInfo=data;
require(['sammy','archiva.main','domReady!'],function (domReady) {
- $.log("startArchivaApplication");
startArchivaApplication();
$("#loadingDiv").hide();
})
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=1360439&r1=1360438&r2=1360439&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 Wed Jul 11 22:03:29 2012
@@ -65,7 +65,8 @@ function() {
return;
}
// by default display search screen
- window.sammyArchivaApplication.setLocation("#search");
+ $.log("location:"+window.sammyArchivaApplication.getLocation());
+ //window.sammyArchivaApplication.setLocation("#search");
}
hasKarma=function(karmaName){
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=1360439&r1=1360438&r2=1360439&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 Wed Jul 11 22:03:29 2012
@@ -289,6 +289,8 @@ define("redback.user",["jquery","utils",
return;
}
self.user.createAdmin();
+ // go to search when admin created
+ window.sammyArchivaApplication.setLocation("#search");
}
}
@@ -296,24 +298,40 @@ define("redback.user",["jquery","utils",
* open a modal box to create admin user
*/
adminCreateBox=function() {
- $.log("adminCreateBox");
- window.redbackModel.createUser=true;
- $("#main-content").attr("data-bind",'template: {name:"redback/user-edit-tmpl",data: user}');
- var viewModel = new AdminUserViewModel();
- ko.applyBindings(viewModel,$("#main-content" ).get(0));
- $("#user-create").validate({
- rules: {
- confirmPassword: {
- equalTo: "#password"
+
+
+ $.ajax("restServices/redbackServices/userService/isAdminUserExists", {
+ type: "GET",
+ dataType: 'json',
+ success: function(data) {
+ var adminExists = data;
+ if (adminExists == false) {
+
+ window.redbackModel.createUser=true;
+ $("#main-content").attr("data-bind",'template: {name:"redback/user-edit-tmpl",data: user}');
+ var viewModel = new AdminUserViewModel();
+ ko.applyBindings(viewModel,$("#main-content" ).get(0));
+ $.log("adminCreateBox");
+ $("#user-create").validate({
+ rules: {
+ confirmPassword: {
+ equalTo: "#password"
+ }
+ },
+ showErrors: function(validator, errorMap, errorList) {
+ customShowError("#main-content #user-create",validator,errorMap,errorMap);
+ }
+
+ });
+ // desactivate roles pill when adding user
+ $("#edit_user_details_pills_headers").hide();
+
+ } else {
+ window.sammyArchivaApplication.setLocation("#search");
}
- },
- showErrors: function(validator, errorMap, errorList) {
- customShowError("#main-content #user-create",validator,errorMap,errorMap);
- }
+ }
});
- // desactivate roles pill when adding user
- $("#edit_user_details_pills_headers").hide();
}
/**