java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java |
24 ++++++++++
java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java |
14 +++--
2 files changed, 32 insertions(+), 6 deletions(-)
New commits:
commit 6baa5e5c5345688bf64beae62d9ded4593225b90
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jan 19 16:11:21 2010 +0100
fixed UserHandlerTest CreateOrgCommandTest
diff --git a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java
b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java
index f53e57e..ba04a3f 100644
--- a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java
@@ -218,12 +218,14 @@ public class CreateUserCommand {
* errors list.
*/
private void validatePrefix() {
- // Make sure set prefix is valid
- SortedSet validPrefixes = LocalizationService.getInstance().availablePrefixes();
- if (!validPrefixes.contains(user.getPrefix())) {
- errors.add(new ValidatorError(
- "Invalid prefix [" + user.getPrefix() + "]. Must be
one of " +
- validPrefixes.toString()));
+ if (user.getPrefix() != null) {
+ // Make sure whether prefix is valid, if it is set
+ SortedSet validPrefixes =
LocalizationService.getInstance().availablePrefixes();
+ if (!validPrefixes.contains(user.getPrefix())) {
+ errors.add(new ValidatorError(
+ "Invalid prefix [" + user.getPrefix() + "]. Must
be one of " +
+ validPrefixes.toString()));
+ }
}
}
commit 29fdd175dee934867a7e824437f724d57f92e646
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jan 18 17:58:03 2010 +0100
493176 - introducing kickstart.tree.getDetails API call
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java
index c3d21ce..41534a9 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java
@@ -40,6 +40,30 @@ import java.util.List;
public class KickstartTreeHandler extends BaseHandler {
/**
+ * Returns details of kickstartable tree specified by the label
+ * @param sessionKey User's session key.
+ * @param treeLabel Label of kickstartable tree to search.
+ * @return found KickstartableTreeObject
+ *
+ * @xmlrpc.doc The detailed information about a kickstartable tree given the tree
name.
+ * @xmlrpc.param #param("string", "sessionKey")
+ * @xmlrpc.param #param_desc("string", "treeLabel", "Label
of kickstartable tree to
+ * search.")
+ * @xmlrpc.returntype $KickstartTreeSerializer
+ */
+ public KickstartableTree getDetails(String sessionKey, String treeLabel) {
+ User loggedInUser = getLoggedInUser(sessionKey);
+ ensureConfigAdmin(loggedInUser);
+
+ KickstartableTree tree = KickstartFactory.lookupKickstartTreeByLabel(treeLabel);
+ if (tree == null) {
+ throw new InvalidChannelLabelException();
+ }
+
+ return tree;
+ }
+
+ /**
* List the available kickstartable trees for the given channel.
* @param sessionKey User's session key.
* @param channelLabel Label of channel to search.
Show replies by date