opendev/gerrit
Code Issues Proposed changes

Merge "Make PUT on /projects/<name>/parent return the new parent name"

Browse Source
This commit is contained in:
Shawn Pearce
2013-03-07 15:32:20 +00:00
committed by Gerrit Code Review
parent 78ddd1866c 3dbd7ec133
commit 0b9027ef9e
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java
View File

@@ -54,7 +54,7 @@ class SetParent implements RestModifyView<ProjectResource, Input> {
}
@Override
public Object apply(ProjectResource resource, Input input)
public String apply(ProjectResource resource, Input input)
throws AuthException, BadRequestException, ResourceConflictException,
Exception {
ProjectControl ctl = resource.getControl();
@@ -83,11 +83,8 @@ class SetParent implements RestModifyView<ProjectResource, Input> {
config.commit(md);
cache.evict(ctl.getProject());
ListProjects.ProjectInfo info = new ListProjects.ProjectInfo();
info.setName(resource.getName());
info.parent = project.getParentName();
info.description = project.getDescription();
return info;
Project.NameKey parentName = project.getParent(allProjects);
return parentName != null ? parentName.get() : "";
} finally {
md.close();
}