opendev/gerrit
Code Issues Proposed changes

Merge "Fix project creation with plugin config if user is not project owner" into stable-2.10

Browse Source
This commit is contained in:
Edwin Kempin 2015-04-30 07:10:29 +00:00 committed by Gerrit Code Review
commit fa7880a804
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/project/CreateProject.java
View File

@ -147,7 +147,7 @@ public class CreateProject implements RestModifyView<TopLevelResource, ProjectIn
projectControlFactory.controlFor(p.getNameKey(), currentUser.get()); projectControlFactory.controlFor(p.getNameKey(), currentUser.get());
PutConfig.Input in = new PutConfig.Input(); PutConfig.Input in = new PutConfig.Input();
in.pluginConfigValues = input.pluginConfigValues; in.pluginConfigValues = input.pluginConfigValues;
putConfig.get().apply(new ProjectResource(projectControl), in); putConfig.get().apply(projectControl, in);
} catch (NoSuchProjectException e) { } catch (NoSuchProjectException e) {
throw new ResourceNotFoundException(p.getName()); throw new ResourceNotFoundException(p.getName());
} }

11
gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java
View File

@ -114,11 +114,16 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
public ConfigInfo apply(ProjectResource rsrc, Input input) public ConfigInfo apply(ProjectResource rsrc, Input input)
throws ResourceNotFoundException, BadRequestException, throws ResourceNotFoundException, BadRequestException,
ResourceConflictException { ResourceConflictException {
Project.NameKey projectName = rsrc.getNameKey();
if (!rsrc.getControl().isOwner()) { if (!rsrc.getControl().isOwner()) {
throw new ResourceNotFoundException(projectName.get()); throw new ResourceNotFoundException(rsrc.getName());
} }
return apply(rsrc.getControl(), input);
}
public ConfigInfo apply(ProjectControl ctrl, Input input)
throws ResourceNotFoundException, BadRequestException,
ResourceConflictException {
Project.NameKey projectName = ctrl.getProject().getNameKey();
if (input == null) { if (input == null) {
throw new BadRequestException("config is required"); throw new BadRequestException("config is required");
} }
@ -163,7 +168,7 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
} }
if (input.pluginConfigValues != null) { if (input.pluginConfigValues != null) {
setPluginConfigValues(rsrc.getControl().getProjectState(), setPluginConfigValues(ctrl.getProjectState(),
projectConfig, input.pluginConfigValues); projectConfig, input.pluginConfigValues);
} }