Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 13:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix TODO

Browse Source
This commit is contained in:
Naoki Takezoe
2014-07-13 23:20:16 +09:00
parent 1f56e1360d
commit 652a68c5b1
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/app/IndexController.scala
View File

@@ -88,8 +88,6 @@ trait IndexControllerBase extends ControllerBase {
/** /**
* JSON API for collaborator completion. * JSON API for collaborator completion.
*
* TODO Move to other controller?
*/ */
get("/_user/proposals")(usersOnly { get("/_user/proposals")(usersOnly {
contentType = formats("json") contentType = formats("json")
@@ -98,5 +96,11 @@ trait IndexControllerBase extends ControllerBase {
) )
}) })
/**
* JSON APU for checking user existence.
*/
post("/_user/existence")(usersOnly {
getAccountByUserName(params("userName")).isDefined
})
} }

5
src/main/scala/app/UserManagementController.scala
View File

@@ -182,11 +182,6 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
} }
}) })
// TODO Move to other generic controller?
post("/admin/users/_usercheck"){
getAccountByUserName(params("userName")).isDefined
}
private def members: Constraint = new Constraint(){ private def members: Constraint = new Constraint(){
override def validate(name: String, value: String, messages: Messages): Option[String] = { override def validate(name: String, value: String, messages: Messages): Option[String] = {
if(value.split(",").exists { if(value.split(",").exists {

8
src/main/twirl/account/group.scala.html
View File

@@ -60,7 +60,7 @@ $(function(){
}); });
$('#addMember').click(function(){ $('#addMember').click(function(){
$('#error-memberName').text(''); $('#error-members').text('');
var userName = $('#memberName').val(); var userName = $('#memberName').val();
// check empty // check empty
@@ -73,18 +73,18 @@ $(function(){
return $(this).data('name') == userName; return $(this).data('name') == userName;
}).length > 0; }).length > 0;
if(exists){ if(exists){
$('#error-memberName').text('User has been already added.'); $('#error-members').text('User has been already added.');
return false; return false;
} }
// check existence // check existence
$.post('@path/admin/users/_usercheck', { $.post('@path/_user/existence', {
'userName': userName 'userName': userName
}, function(data, status){ }, function(data, status){
if(data == 'true'){ if(data == 'true'){
addMemberHTML(userName, false); addMemberHTML(userName, false);
} else { } else {
$('#error-memberName').text('User does not exist.'); $('#error-members').text('User does not exist.');
} }
}); });
}); });

8
src/main/twirl/admin/users/group.scala.html
View File

@@ -59,7 +59,7 @@ $(function(){
}); });
$('#addMember').click(function(){ $('#addMember').click(function(){
$('#error-memberName').text(''); $('#error-members').text('');
var userName = $('#memberName').val(); var userName = $('#memberName').val();
// check empty // check empty
@@ -72,18 +72,18 @@ $(function(){
return $(this).data('name') == userName; return $(this).data('name') == userName;
}).length > 0; }).length > 0;
if(exists){ if(exists){
$('#error-memberName').text('User has been already added.'); $('#error-members').text('User has been already added.');
return false; return false;
} }
// check existence // check existence
$.post('@path/admin/users/_usercheck', { $.post('@path/_user/existence', {
'userName': userName 'userName': userName
}, function(data, status){ }, function(data, status){
if(data == 'true'){ if(data == 'true'){
addMemberHTML(userName, false); addMemberHTML(userName, false);
} else { } else {
$('#error-memberName').text('User does not exist.'); $('#error-members').text('User does not exist.');
} }
}); });
}); });