java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 6
------
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 7
+++++++
java/code/src/com/redhat/rhn/manager/kickstart/KickstartSessionCreateCommand.java | 2
+-
3 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 6f9a0a2692973012cb8dfefcbfb60ded810da409
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 25 16:47:09 2011 +0200
The KickstartSessionCreateCommand is duplicated in KickstartWizardHelper.
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index 18e370a..9bfa4ec 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -28,7 +28,6 @@ import com.redhat.rhn.domain.token.ActivationKeyFactory;
import com.redhat.rhn.domain.token.Token;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.kickstart.KickstartFormatter;
-import com.redhat.rhn.manager.kickstart.KickstartSessionCreateCommand;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerCommand;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
@@ -1171,11 +1170,6 @@ public class KickstartData {
cloned.setNoBase(this.getNoBase());
cloned.setIgnoreMissing(this.getIgnoreMissing());
- //create a new session one
- KickstartSessionCreateCommand cmd = new KickstartSessionCreateCommand(
- user.getOrg(), cloned);
- cmd.store();
-
}
// Helper method to copy KickstartCommands
commit edcae0f1385122767616df7c98bdf67e7a69200d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 25 15:23:38 2011 +0200
For the default_session, use better note in rhnregtoken table.
Instead of
Kickstart re-activation key for .
say
Default session activation key for profile rhel-5-7.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 8ce44ad..fda871a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -6627,6 +6627,13 @@ Follow this url to see the full list of inactive systems:
</context-group>
</trans-unit>
+ <trans-unit id="kickstart.profile.default_session">
+ <source>Default session activation key for profile {0}.</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">/rhn/kickstart/CreateProfileWizard.do</context>
+ </context-group>
+ </trans-unit>
+
<trans-unit id="kickstart.session.newprofile">
<source>Profile for kickstart session {0}.</source>
<context-group name="ctx">
diff --git
a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSessionCreateCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSessionCreateCommand.java
index baf55a0..7b0e909 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSessionCreateCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartSessionCreateCommand.java
@@ -89,7 +89,7 @@ public class KickstartSessionCreateCommand {
User user = UserFactory.findRandomOrgAdmin(owner);
log.debug("Got random orgadmin: " + user.getLogin());
String note = LocalizationService.getInstance().
- getMessage("kickstart.session.newtokennote", " ");
+ getMessage("kickstart.profile.default_session",
ksdata.getLabel());
log.debug("creating one-time-activation key: " + user.getLogin());
ActivationKey key = KickstartScheduleCommand.createKickstartActivationKey(user,
Show replies by date