modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java | 196 ++++++---- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 10 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 8 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 10 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 8 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 12 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 8 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 18 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 18 modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml | 18 10 files changed, 229 insertions(+), 77 deletions(-)
New commits: commit 724b2cf697c03efb3ba6017cda2386ec5ed21a4e Author: Jay Shaughnessy jshaughn@redhat.com Date: Tue Aug 20 21:08:14 2013 -0400
BundleCreateWizard BundleGroups step work - more to do - cover the use cases better - add some I18N support
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java index e330e3f..6b3b29c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleGroupsStep.java @@ -44,6 +44,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.bundle.BundleGroup; import org.rhq.core.domain.bundle.BundleVersion; +import org.rhq.core.domain.bundle.composite.BundleGroupAssignmentComposite; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.bundle.group.BundleGroupSelector; import org.rhq.enterprise.gui.coregui.client.bundle.group.BundleGroupsDataSource; @@ -61,7 +62,6 @@ public class BundleGroupsStep extends AbstractWizardStep {
private EnhancedVLayout canvas; private DynamicForm radioForm; - private final BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); private AbstractBundleCreateWizard wizard = null; private boolean isInitialVersion; private BundleGroupSelector selector; @@ -74,70 +74,134 @@ public class BundleGroupsStep extends AbstractWizardStep { canvas = new EnhancedVLayout(); canvas.setWidth100();
- radioForm = new DynamicForm(); - radioForm.setNumCols(1); - // These settings (as opposed to setWidth100()) allow for contextual help to be better placed - radioForm.setAutoWidth(); - radioForm.setOverflow(Overflow.VISIBLE); - - List<FormItem> formItems = new ArrayList<FormItem>(); - - // Make the radio item title a separate item in the form in order to add contextual help - // to the right of the title text. We could also add it to the radio item but then it floats to - // the right of the last radio button option (I'll leave that commented below if for some reason - // we want to switch to that approach. - StaticTextItem radioTitleItem = new StaticTextItem("RadioTitle"); - radioTitleItem.setShowTitle(false); - radioTitleItem.setTitleOrientation(TitleOrientation.TOP); - radioTitleItem.setAlign(Alignment.LEFT); - // The css style "formTitle" is what should work here, but for some reason I wasn't getting the - // proper color. So instead I grabbed the color from the smartgwt css and declared it explicitly. - //radioTitleItem.setCellStyle("formTitle"); - radioTitleItem.setValue("<span style="font-weight: bold; color: #003168">" - + "The assigned bundle groups (I18N)" + " :</span>"); - FormUtility.addContextualHelp(radioTitleItem, "Add actual help (I18N)"); - formItems.add(radioTitleItem); - - RadioGroupItem radioGroupItem = new RadioGroupItem("RadioOptions"); - radioGroupItem.setShowTitle(false); - radioGroupItem.setRequired(true); - radioGroupItem.setAlign(Alignment.LEFT); - // TODO: I18N - LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>(); - if (wizard.getBundleGroupAssignmentComposite().isCanBeUnassigned()) { - valueMap.put("unassigned", "Leave Unassigned"); + // go get the assignable/assigned bundle groups for this new bundle version, initial or not + this.isInitialVersion = this.wizard.getBundleVersion() == null + || this.wizard.getBundleVersion().getVersionOrder() == 0; + + if (isInitialVersion) { + canvas = getInitialVersionCanvas(); + } else { + canvas = getNonInitialVersionCanvas(); } - valueMap.put("assigned", "Assign to at least one Bundle Group"); - radioGroupItem.setValueMap(valueMap); - - radioGroupItem.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent event) { - if ("unassigned".equals(event.getValue())) { - //SC.say(MSG.view_drift_wizard_pinTemplate_infoStepSelectBlocked()); - // event.getItem().setValue(CREATE_TEMPLATE); - selector.disable(); - return; - - } else { - selector.enable(); - }
- canvas.markForRedraw(); + return canvas; + } + + private EnhancedVLayout getInitialVersionCanvas() { + BundleGroupAssignmentComposite composite = wizard.getBundleGroupAssignmentComposite(); + final Map<BundleGroup, Boolean> map = composite.getBundleGroupMap(); + + if (composite.isCanBeUnassigned()) { + radioForm = new DynamicForm(); + radioForm.setNumCols(1); + // These settings (as opposed to setWidth100()) allow for contextual help to be better placed + radioForm.setAutoWidth(); + radioForm.setOverflow(Overflow.VISIBLE); + + List<FormItem> formItems = new ArrayList<FormItem>(); + + // Make the radio item title a separate item in the form in order to add contextual help + // to the right of the title text. We could also add it to the radio item but then it floats to + // the right of the last radio button option (I'll leave that commented below if for some reason + // we want to switch to that approach. + StaticTextItem radioTitleItem = new StaticTextItem("RadioTitle"); + radioTitleItem.setShowTitle(false); + radioTitleItem.setTitleOrientation(TitleOrientation.TOP); + radioTitleItem.setAlign(Alignment.LEFT); + // The css style "formTitle" is what should work here, but for some reason I wasn't getting the + // proper color. So instead I grabbed the color from the smartgwt css and declared it explicitly. + //radioTitleItem.setCellStyle("formTitle"); + radioTitleItem.setValue("<span style="font-weight: bold; color: #003168">" + + MSG.view_bundle_createWizard_groupsStep_radioTitle() + " :</span>"); + FormUtility.addContextualHelp(radioTitleItem, MSG.view_bundle_createWizard_groupsStep_help()); + formItems.add(radioTitleItem); + + RadioGroupItem radioGroupItem = new RadioGroupItem("RadioOptions"); + radioGroupItem.setShowTitle(false); + radioGroupItem.setRequired(true); + radioGroupItem.setAlign(Alignment.LEFT); + LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>(); + if (wizard.getBundleGroupAssignmentComposite().isCanBeUnassigned()) { + valueMap.put("unassigned", MSG.view_bundle_createWizard_groupsStep_leaveUnassigned()); } - }); + valueMap.put("assign", MSG.view_bundle_createWizard_groupsStep_assign()); + radioGroupItem.setValueMap(valueMap); + + radioGroupItem.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + if ("unassigned".equals(event.getValue())) { + selector.disable(); + return; + + } else { + if (!map.isEmpty()) { + selector.enable(); + } + } + + canvas.markForRedraw(); + } + });
- formItems.add(radioGroupItem); - formItems.add(new SpacerItem()); - radioForm.setItems(formItems.toArray(new FormItem[formItems.size()])); - canvas.addMember(radioForm); + formItems.add(radioGroupItem); + formItems.add(new SpacerItem()); + radioForm.setItems(formItems.toArray(new FormItem[formItems.size()])); + canvas.addMember(radioForm);
- // go get the assignable/assigned bundle groups for this new bundle version, initial or not - this.isInitialVersion = this.wizard.getBundleVersion() == null - || this.wizard.getBundleVersion().getVersionOrder() == 0; + selector = getSelector(map, false); + selector.setTitle(MSG.view_bundle_createWizard_groupsStep_assign()); + selector.setTooltip(MSG.view_bundle_createWizard_groupsStep_help()); + selector.disable(); + canvas.addMember(selector); + + } else if (!map.isEmpty()) { + selector = getSelector(map, false); + selector.setTitle(MSG.view_bundle_createWizard_groupsStep_assign()); + selector.setTooltip(MSG.view_bundle_createWizard_groupsStep_help()); + canvas.addMember(selector); + + } else { + throw new IllegalStateException(MSG.view_bundle_createWizard_groupsStep_noAssignable()); + } + + return canvas; + } + + private EnhancedVLayout getNonInitialVersionCanvas() { + BundleGroupAssignmentComposite composite = wizard.getBundleGroupAssignmentComposite(); + final Map<BundleGroup, Boolean> map = composite.getBundleGroupMap();
- Map<BundleGroup, Boolean> map = wizard.getBundleGroupAssignmentComposite().getBundleGroupMap(); if (map.isEmpty()) { - selector = new BundleGroupSelector(!isInitialVersion); + DynamicForm form = new DynamicForm(); + + StaticTextItem unassignedItem = new StaticTextItem("CurrentlyUnassigned"); + unassignedItem.setShowTitle(false); + unassignedItem.setTitleOrientation(TitleOrientation.TOP); + unassignedItem.setAlign(Alignment.LEFT); + // The css style "formTitle" is what should work here, but for some reason I wasn't getting the + // proper color. So instead I grabbed the color from the smartgwt css and declared it explicitly. + //radioTitleItem.setCellStyle("formTitle"); + unassignedItem.setValue("<span style="font-weight: bold; color: #003168">" + + MSG.view_bundle_createWizard_groupsStep_unassigned() + " :</span>"); + FormUtility.addContextualHelp(unassignedItem, MSG.view_bundle_createWizard_groupsStep_help()); + form.setItems(unassignedItem); + canvas.addMember(form); + + } else { + selector = getSelector(map, true); + selector.setTitle(MSG.view_bundle_createWizard_groupsStep_assigned()); + selector.setTooltip(MSG.view_bundle_createWizard_groupsStep_help()); + canvas.addMember(selector); + } + + return canvas; + } + + private BundleGroupSelector getSelector(final Map<BundleGroup, Boolean> map, boolean readOnly) { + BundleGroupSelector result; + + if (map.isEmpty()) { + result = new BundleGroupSelector(readOnly);
} else { Set<BundleGroup> bundleGroups = map.keySet(); @@ -154,12 +218,11 @@ public class BundleGroupsStep extends AbstractWizardStep { initiallyAssigned.add(ds.copyValues(bundleGroup)); } } - selector = new BundleGroupSelector(idsFilter, - initiallyAssigned.toArray(new ListGridRecord[initiallyAssigned.size()]), !isInitialVersion); + result = new BundleGroupSelector(idsFilter, initiallyAssigned.toArray(new ListGridRecord[initiallyAssigned + .size()]), readOnly); } - canvas.addMember(selector);
- return canvas; + return result; }
public Set<BundleGroup> getSelectedBundleGroups() { @@ -167,6 +230,15 @@ public class BundleGroupsStep extends AbstractWizardStep { }
public boolean nextPage() { + if (isInitialVersion) { + BundleGroupAssignmentComposite composite = wizard.getBundleGroupAssignmentComposite(); + + if (!composite.isCanBeUnassigned() && selector.getSelectedItems().isEmpty()) { + wizard.getView().showMessage(MSG.view_bundle_createWizard_groupsStep_noneAssigned()); + return false; + } + } + if (null == wizard.getBundleVersion()) { if (null != wizard.getCreateInitialBundleVersionRecipe()) { processRecipe(); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index c253fbd..fc6b050 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -1219,9 +1219,17 @@ view_bundle_createWizard_clickToUploadRecipe = Click to load a recipe file view_bundle_createWizard_createFailure = Failed to create the bundle view_bundle_createWizard_createSuccessful = You have successfully created a bundle named [{0}] with a version of [{1}] view_bundle_createWizard_enterRecipe = Please supply a valid recipe -view_bundle_createWizard_enterUrl = Please enter a valid URL where the bundle distribution file can be downloaded from +view_bundle_createWizard_enterUrl = Please enter a valid URL from where the bundle distribution file can be downloaded view_bundle_createWizard_failedToUploadDistroFile = Failed to upload bundle distribution file view_bundle_createWizard_failedToUploadFile = Failed to upload bundle file +view_bundle_createWizard_groupsStep_assign = Assign at least one of the eligible bundle groups: +view_bundle_createWizard_groupsStep_assigned = The new bundle version is for an existing bundle and inherits its bundle group assignments: +view_bundle_createWizard_groupsStep_help = A new bundle is created when uploading the first version for that bundle. The new bundle is then assigned to its initial bundle groups. A user can only assign the new bundle to bundle groups for which he has Create Bundles permission, either global or at the bundle group level. At least one bundle group must be assigned unless the user has global Create and global View Bundles permission, in which case it can be left unassigned. +view_bundle_createWizard_groupsStep_leaveUnassigned = Leave the new bundle unsassigned. +view_bundle_createWizard_groupsStep_noAssignable = Unable to create initial bundle version because the user has no bundle groups to which it can be assigned. Please cancel the create wizard and notify your RHQ administrator. +view_bundle_createWizard_groupsStep_noneAssigned = The new bundle version must be assigned to at least one bundle group! +view_bundle_createWizard_groupsStep_radioTitle = Initial bundle group assignment for the new bundle: +view_bundle_createWizard_groupsStep_unassigned = The new bundle version is for an existing bundle and inherits its bundle group assignments. The bundle in not currently assigned to any bundle groups. view_bundle_createWizard_loadBundleFileFailure = Cannot obtain bundle file information from server view_bundle_createWizard_noAdditionalFilesNeeded = No additional files need to be uploaded for this bundle view_bundle_createWizard_noBundleTypesAvail = No bundle types are available diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index c4db863..7bf260a 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -1236,6 +1236,14 @@ view_bundle_createWizard_enterRecipe = Prosím vložte validní recept view_bundle_createWizard_enterUrl = Prosím vložte validní URL, odkud může být stažen soubor s distribucí balíku view_bundle_createWizard_failedToUploadDistroFile = Nepodařilo se nahrát distribuční soubor balíku view_bundle_createWizard_failedToUploadFile = Nepodařilo se nahrát soubor balíku +##view_bundle_createWizard_groupsStep_assign = Assign at least one of the eligible bundle groups: +##view_bundle_createWizard_groupsStep_assigned = The new bundle version is for an existing bundle and inherits its bundle group assignments: +##view_bundle_createWizard_groupsStep_help = A new bundle is created when uploading the first version for that bundle. The new bundle is then assigned to its initial bundle groups. A user can only assign the new bundle to bundle groups for which he has Create Bundles permission, either global or at the bundle group level. At least one bundle group must be assigned unless the user has global Create and global View Bundles permission, in which case it can be left unassigned. +##view_bundle_createWizard_groupsStep_leaveUnassigned = Leave the new bundle unsassigned. +##view_bundle_createWizard_groupsStep_noAssignable = Unable to create initial bundle version because the user has no bundle groups to which it can be assigned. Please cancel the create wizard and notify your RHQ administrator. +##view_bundle_createWizard_groupsStep_noneAssigned = The new bundle version must be assigned to at least one bundle group! +##view_bundle_createWizard_groupsStep_radioTitle = Initial bundle group assignment for the new bundle: +##view_bundle_createWizard_groupsStep_unassigned = The new bundle version is for an existing bundle and inherits its bundle group assignments. The bundle in not currently assigned to any bundle groups. view_bundle_createWizard_loadBundleFileFailure = Nepodařilo se získat soubor s informacemi o balíku ze serveru view_bundle_createWizard_noAdditionalFilesNeeded = Žádné dodatečné soubory nejsou potřeba pro tento balík view_bundle_createWizard_noBundleTypesAvail = Žádné typy balíků nejsou k dispozici diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index a1e43f3..757ea3b 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -1135,8 +1135,18 @@ view_bundle_bundleVersions = Bundle-Versionen ##view_bundle_createWizard_clickToUploadRecipe = Click to upload a recipe file ##view_bundle_createWizard_createFailure = Failed to create the bundle ##view_bundle_createWizard_createSuccessful = You have successfully created a bundle named [{0}] with a version of [{1}] +##view_bundle_createWizard_enterRecipe = Please supply a valid recipe +##view_bundle_createWizard_enterUrl = Please enter a valid URL from where the bundle distribution file can be downloaded ##view_bundle_createWizard_failedToUploadDistroFile = Failed to upload bundle distribution file ##view_bundle_createWizard_failedToUploadFile = Failed to upload bundle file +##view_bundle_createWizard_groupsStep_assign = Assign at least one of the eligible bundle groups: +##view_bundle_createWizard_groupsStep_assigned = The new bundle version is for an existing bundle and inherits its bundle group assignments: +##view_bundle_createWizard_groupsStep_help = A new bundle is created when uploading the first version for that bundle. The new bundle is then assigned to its initial bundle groups. A user can only assign the new bundle to bundle groups for which he has Create Bundles permission, either global or at the bundle group level. At least one bundle group must be assigned unless the user has global Create and global View Bundles permission, in which case it can be left unassigned. +##view_bundle_createWizard_groupsStep_leaveUnassigned = Leave the new bundle unsassigned. +##view_bundle_createWizard_groupsStep_noAssignable = Unable to create initial bundle version because the user has no bundle groups to which it can be assigned. Please cancel the create wizard and notify your RHQ administrator. +##view_bundle_createWizard_groupsStep_noneAssigned = The new bundle version must be assigned to at least one bundle group! +##view_bundle_createWizard_groupsStep_radioTitle = Initial bundle group assignment for the new bundle: +##view_bundle_createWizard_groupsStep_unassigned = The new bundle version is for an existing bundle and inherits its bundle group assignments. The bundle in not currently assigned to any bundle groups. ##view_bundle_createWizard_loadBundleFileFailure = Cannot obtain bundle file information from server ##view_bundle_createWizard_noAdditionalFilesNeeded = No additional files need to be uploaded for this bundle ##view_bundle_createWizard_noBundleTypesAvail = No bundle types are available diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index c9a319b..c57ede1 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -1211,6 +1211,14 @@ view_bundle_createWizard_enterRecipe = 正しいレシピを提供してくだ view_bundle_createWizard_enterUrl = バンドル配布ファイルをダウンロードできる正しいURLを入力してください view_bundle_createWizard_failedToUploadDistroFile = バンドル配布ファイルのアップロードに失敗しました view_bundle_createWizard_failedToUploadFile = バンドルファイルのアップロードに失敗しました +##view_bundle_createWizard_groupsStep_assign = Assign at least one of the eligible bundle groups: +##view_bundle_createWizard_groupsStep_assigned = The new bundle version is for an existing bundle and inherits its bundle group assignments: +##view_bundle_createWizard_groupsStep_help = A new bundle is created when uploading the first version for that bundle. The new bundle is then assigned to its initial bundle groups. A user can only assign the new bundle to bundle groups for which he has Create Bundles permission, either global or at the bundle group level. At least one bundle group must be assigned unless the user has global Create and global View Bundles permission, in which case it can be left unassigned. +##view_bundle_createWizard_groupsStep_leaveUnassigned = Leave the new bundle unsassigned. +##view_bundle_createWizard_groupsStep_noAssignable = Unable to create initial bundle version because the user has no bundle groups to which it can be assigned. Please cancel the create wizard and notify your RHQ administrator. +##view_bundle_createWizard_groupsStep_noneAssigned = The new bundle version must be assigned to at least one bundle group! +##view_bundle_createWizard_groupsStep_radioTitle = Initial bundle group assignment for the new bundle: +##view_bundle_createWizard_groupsStep_unassigned = The new bundle version is for an existing bundle and inherits its bundle group assignments. The bundle in not currently assigned to any bundle groups. view_bundle_createWizard_loadBundleFileFailure = サーバーからバンドルファイル情報の取得ができません view_bundle_createWizard_noAdditionalFilesNeeded = このバンドルのためにアップロードされる必要がある追加ファイルはありません view_bundle_createWizard_noBundleTypesAvail = バンドルタイプが利用できません diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 627c73b..3781e74 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -1077,11 +1077,23 @@ view_bundle_bundleFiles = 번들 파일 view_bundle_bundleVersion = 번들 버전 view_bundle_bundleVersions = 번들 버전 view_bundle_createWizard_bundleDistro = 번들 배포 +##view_bundle_createWizard_cancelFailure = Failed to fully cancel the creation of bundle [{0}], version = [{1}] - the bundle may still exist in the database view_bundle_createWizard_cancelSuccessful = 번들 [{0}], 버전 = [{1}]의 생성을 취소했습니다. view_bundle_createWizard_clickToUploadRecipe = 레시피 파일을 로드하기 위해 클릭하십시오 view_bundle_createWizard_createFailure = 번들 생성에 실패했습니다 view_bundle_createWizard_createSuccessful = 버전 [{1}]의 [{0}]라는 번들 생성에 성공했습니다. view_bundle_createWizard_enterRecipe = 올바른 레시피를 제공하십시오 +view_bundle_createWizard_enterUrl = Please enter a valid URL from where the bundle distribution file can be downloaded +##view_bundle_createWizard_failedToUploadDistroFile = Failed to upload bundle distribution file +##view_bundle_createWizard_failedToUploadFile = Failed to upload bundle file +##view_bundle_createWizard_groupsStep_assign = Assign at least one of the eligible bundle groups: +##view_bundle_createWizard_groupsStep_assigned = The new bundle version is for an existing bundle and inherits its bundle group assignments: +##view_bundle_createWizard_groupsStep_help = A new bundle is created when uploading the first version for that bundle. The new bundle is then assigned to its initial bundle groups. A user can only assign the new bundle to bundle groups for which he has Create Bundles permission, either global or at the bundle group level. At least one bundle group must be assigned unless the user has global Create and global View Bundles permission, in which case it can be left unassigned. +##view_bundle_createWizard_groupsStep_leaveUnassigned = Leave the new bundle unsassigned. +##view_bundle_createWizard_groupsStep_noAssignable = Unable to create initial bundle version because the user has no bundle groups to which it can be assigned. Please cancel the create wizard and notify your RHQ administrator. +##view_bundle_createWizard_groupsStep_noneAssigned = The new bundle version must be assigned to at least one bundle group! +##view_bundle_createWizard_groupsStep_radioTitle = Initial bundle group assignment for the new bundle: +##view_bundle_createWizard_groupsStep_unassigned = The new bundle version is for an existing bundle and inherits its bundle group assignments. The bundle in not currently assigned to any bundle groups. view_bundle_createWizard_loadBundleFileFailure = 서버에서 번들 파일 정보를 획득 할 수 없습니다 view_bundle_createWizard_provideBundleDistro = 번들 배포 제공 view_bundle_createWizard_recipeOption = 레시피 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 65a9fba..579420b 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -1224,6 +1224,14 @@ view_bundle_createWizard_enterRecipe = Favor fornecer um script v\u00E1lido view_bundle_createWizard_enterUrl = Favor informar uma URL v\u00E1lida para download do arquivo de distribui\u00E7\u00E3o do bundle view_bundle_createWizard_failedToUploadDistroFile = Falha ao fazer o upload do arquivo de distribui\u00E7\u00E3o do bundle. view_bundle_createWizard_failedToUploadFile = Falha ao fazer o upload do bundle +##view_bundle_createWizard_groupsStep_assign = Assign at least one of the eligible bundle groups: +##view_bundle_createWizard_groupsStep_assigned = The new bundle version is for an existing bundle and inherits its bundle group assignments: +##view_bundle_createWizard_groupsStep_help = A new bundle is created when uploading the first version for that bundle. The new bundle is then assigned to its initial bundle groups. A user can only assign the new bundle to bundle groups for which he has Create Bundles permission, either global or at the bundle group level. At least one bundle group must be assigned unless the user has global Create and global View Bundles permission, in which case it can be left unassigned. +##view_bundle_createWizard_groupsStep_leaveUnassigned = Leave the new bundle unsassigned. +##view_bundle_createWizard_groupsStep_noAssignable = Unable to create initial bundle version because the user has no bundle groups to which it can be assigned. Please cancel the create wizard and notify your RHQ administrator. +##view_bundle_createWizard_groupsStep_noneAssigned = The new bundle version must be assigned to at least one bundle group! +##view_bundle_createWizard_groupsStep_radioTitle = Initial bundle group assignment for the new bundle: +##view_bundle_createWizard_groupsStep_unassigned = The new bundle version is for an existing bundle and inherits its bundle group assignments. The bundle in not currently assigned to any bundle groups. view_bundle_createWizard_loadBundleFileFailure = N\u00E3o foi poss\u00EDvel obter infoma\u00E7\u00F5es sobre o arquivo de bundle view_bundle_createWizard_noAdditionalFilesNeeded = N\u00E3o \u00E9 necess\u00E1rio fazer upload de mais arquivos para este bundle view_bundle_createWizard_noBundleTypesAvail = Tipos de bundle n\u00E3o dispon\u00EDveis diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 6088218..466c408 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -2776,6 +2776,24 @@ view_admin_systemSettings_LDAPBindPW_name = Пароль ##view_bundleGroup_deleteConfirm = Are you sure you want to delete this bundle group? Bundles for which this is the only assigned bundle group will become unassigned, and will require global View Bundles permission to view. ##view_bundleGroup_deletesFailure = Failed to delete the bundle groups ##view_bundleGroup_deletesSuccessful = You successfully deleted the bundle groups +##view_bundle_createWizard_bundleDistro = Bundle Distribution +##view_bundle_createWizard_cancelFailure = Failed to fully cancel the creation of bundle [{0}], version = [{1}] - the bundle may still exist in the database +##view_bundle_createWizard_cancelSuccessful = Canceled the creation of bundle [{0}], version = [{1}] +##view_bundle_createWizard_clickToUploadRecipe = Click to load a recipe file +##view_bundle_createWizard_createFailure = Failed to create the bundle +##view_bundle_createWizard_createSuccessful = You have successfully created a bundle named [{0}] with a version of [{1}] +##view_bundle_createWizard_enterRecipe = Please supply a valid recipe +##view_bundle_createWizard_enterUrl = Please enter a valid URL from where the bundle distribution file can be downloaded +##view_bundle_createWizard_failedToUploadDistroFile = Failed to upload bundle distribution file +##view_bundle_createWizard_failedToUploadFile = Failed to upload bundle file +##view_bundle_createWizard_groupsStep_assign = Assign at least one of the eligible bundle groups: +##view_bundle_createWizard_groupsStep_assigned = The new bundle version is for an existing bundle and inherits its bundle group assignments: +##view_bundle_createWizard_groupsStep_help = A new bundle is created when uploading the first version for that bundle. The new bundle is then assigned to its initial bundle groups. A user can only assign the new bundle to bundle groups for which he has Create Bundles permission, either global or at the bundle group level. At least one bundle group must be assigned unless the user has global Create and global View Bundles permission, in which case it can be left unassigned. +##view_bundle_createWizard_groupsStep_leaveUnassigned = Leave the new bundle unsassigned. +##view_bundle_createWizard_groupsStep_noAssignable = Unable to create initial bundle version because the user has no bundle groups to which it can be assigned. Please cancel the create wizard and notify your RHQ administrator. +##view_bundle_createWizard_groupsStep_noneAssigned = The new bundle version must be assigned to at least one bundle group! +##view_bundle_createWizard_groupsStep_radioTitle = Initial bundle group assignment for the new bundle: +##view_bundle_createWizard_groupsStep_unassigned = The new bundle version is for an existing bundle and inherits its bundle group assignments. The bundle in not currently assigned to any bundle groups. ##view_bundle_fail_existingName = Failed to create [{0}]. The name is already being used. Please try another name. ##view_bundle_list_deletesFailure = Failed to delete the bundles ##view_bundle_list_deletesSuccessful = You successfully deleted the bundles diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index ccf79fb..c74decb 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -1199,15 +1199,23 @@ view_bundle_bundleType = Bundle\u7c7b\u578b view_bundle_bundleVersion = Bundle\u7248\u672c view_bundle_bundleVersions = Bundle\u7248\u672c view_bundle_createWizard_bundleDistro = Bundle\u53d1\u5e03 -view_bundle_createWizard_cancelFailure = Failed to fully cancel the creation of bundle [{0}], version = [{1}] - the bundle may still exist in the database -view_bundle_createWizard_cancelSuccessful = Canceled the creation of bundle [{0}], version = [{1}] -view_bundle_createWizard_clickToUploadRecipe = Click to load a recipe file +##view_bundle_createWizard_cancelFailure = Failed to fully cancel the creation of bundle [{0}], version = [{1}] - the bundle may still exist in the database +##view_bundle_createWizard_cancelSuccessful = Canceled the creation of bundle [{0}], version = [{1}] +##view_bundle_createWizard_clickToUploadRecipe = Click to load a recipe file view_bundle_createWizard_createFailure = \u521b\u5efabundle\u5931\u8d25 -view_bundle_createWizard_createSuccessful = You have successfully created a bundle named [{0}] with a version of [{1}] +##view_bundle_createWizard_createSuccessful = You have successfully created a bundle named [{0}] with a version of [{1}] view_bundle_createWizard_enterRecipe = \u8bf7\u63d0\u4f9b\u6709\u6548\u7684recipe -view_bundle_createWizard_enterUrl = Please enter a valid URL where the bundle distribution file can be downloaded from +##view_bundle_createWizard_enterUrl = Please enter a valid URL from where the bundle distribution file can be downloaded view_bundle_createWizard_failedToUploadDistroFile = \u4e0a\u4f20bundle\u53d1\u5e03\u5305\u6587\u4ef6\u5931\u8d25 view_bundle_createWizard_failedToUploadFile = \u4e0a\u4f20bundle\u6587\u4ef6\u5931\u8d25 +##view_bundle_createWizard_groupsStep_assign = Assign at least one of the eligible bundle groups: +##view_bundle_createWizard_groupsStep_assigned = The new bundle version is for an existing bundle and inherits its bundle group assignments: +##view_bundle_createWizard_groupsStep_help = A new bundle is created when uploading the first version for that bundle. The new bundle is then assigned to its initial bundle groups. A user can only assign the new bundle to bundle groups for which he has Create Bundles permission, either global or at the bundle group level. At least one bundle group must be assigned unless the user has global Create and global View Bundles permission, in which case it can be left unassigned. +##view_bundle_createWizard_groupsStep_leaveUnassigned = Leave the new bundle unsassigned. +##view_bundle_createWizard_groupsStep_noAssignable = Unable to create initial bundle version because the user has no bundle groups to which it can be assigned. Please cancel the create wizard and notify your RHQ administrator. +##view_bundle_createWizard_groupsStep_noneAssigned = The new bundle version must be assigned to at least one bundle group!: +##view_bundle_createWizard_groupsStep_radioTitle = Initial bundle group assignment for the new bundle: +##view_bundle_createWizard_groupsStep_unassigned = The new bundle version is for an existing bundle and inherits its bundle group assignments. The bundle in not currently assigned to any bundle groups. view_bundle_createWizard_loadBundleFileFailure = \u65e0\u6cd5\u4ece\u670d\u52a1\u5668\u83b7\u5f97bundle\u6587\u4ef6\u4fe1\u606f view_bundle_createWizard_noAdditionalFilesNeeded = No additional files need to be uploaded for this bundle view_bundle_createWizard_noBundleTypesAvail = \u65e0\u6709\u6548bundle\u7c7b\u578b
commit 1b73123fa99079c5e2f77c321cfc99f257a7d97a Author: Jay Shaughnessy jshaughn@redhat.com Date: Tue Aug 20 18:28:30 2013 -0400
fix some intentional api change entries
diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml index 5840a08..6046507 100644 --- a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml +++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml @@ -81,49 +81,49 @@ <difference> <className>org/rhq/enterprise/server/bundle/BundleManagerRemote</className> <differenceType>7012</differenceType> <!-- method added to an interface --> - <method>void assignBundlesToBundleGroup(org.rhq.core.domain.auth.Subject, int[], int[])</method> + <method>void assignBundlesToBundleGroups(org.rhq.core.domain.auth.Subject, int[], int[])</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference>
<difference> <className>org/rhq/enterprise/server/bundle/BundleManagerRemote</className> <differenceType>7012</differenceType> <!-- method added to an interface --> - <method>org.rhq.core.domain.bundle.BundleGroup createBundleGroup(org.rhq.core.domain.auth.Subject, java.lang.String, java.lang.String)</method> + <method>org.rhq.core.domain.bundle.BundleGroup createBundleGroup(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.bundle.BundleGroup)</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference>
<difference> <className>org/rhq/enterprise/server/bundle/BundleManagerRemote</className> <differenceType>7012</differenceType> <!-- method added to an interface --> - <method>org.rhq.core.domain.bundle.BundleVersion createInitialBundleVersionViaByteArray(org.rhq.core.domain.auth.Subject, int, byte[])</method> + <method>org.rhq.core.domain.bundle.BundleVersion createInitialBundleVersionViaByteArray(org.rhq.core.domain.auth.Subject, int[], byte[])</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference>
<difference> <className>org/rhq/enterprise/server/bundle/BundleManagerRemote</className> <differenceType>7012</differenceType> <!-- method added to an interface --> - <method>org.rhq.core.domain.bundle.BundleVersion createInitialBundleVersionViaFile(org.rhq.core.domain.auth.Subject, int, java.io.File)</method> + <method>org.rhq.core.domain.bundle.BundleVersion createInitialBundleVersionViaFile(org.rhq.core.domain.auth.Subject, int[], java.io.File)</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference>
<difference> <className>org/rhq/enterprise/server/bundle/BundleManagerRemote</className> <differenceType>7012</differenceType> <!-- method added to an interface --> - <method>org.rhq.core.domain.bundle.BundleVersion createInitialBundleVersionViaRecipe(org.rhq.core.domain.auth.Subject, int, java.lang.String)</method> + <method>org.rhq.core.domain.bundle.BundleVersion createInitialBundleVersionViaRecipe(org.rhq.core.domain.auth.Subject, int[], java.lang.String)</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference>
<difference> <className>org/rhq/enterprise/server/bundle/BundleManagerRemote</className> <differenceType>7012</differenceType> <!-- method added to an interface --> - <method>org.rhq.core.domain.bundle.BundleVersion createInitialBundleVersionViaURL(org.rhq.core.domain.auth.Subject, int, java.lang.String)</method> + <method>org.rhq.core.domain.bundle.BundleVersion createInitialBundleVersionViaURL(org.rhq.core.domain.auth.Subject, int[], java.lang.String)</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference>
<difference> <className>org/rhq/enterprise/server/bundle/BundleManagerRemote</className> <differenceType>7012</differenceType> <!-- method added to an interface --> - <method>org.rhq.core.domain.bundle.BundleVersion createInitialBundleVersionViaURL(org.rhq.core.domain.auth.Subject, int, java.lang.String, java.lang.String, java.lang.String)</method> + <method>org.rhq.core.domain.bundle.BundleVersion createInitialBundleVersionViaURL(org.rhq.core.domain.auth.Subject, int[], java.lang.String, java.lang.String, java.lang.String)</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference>
@@ -144,14 +144,14 @@ <difference> <className>org/rhq/enterprise/server/bundle/BundleManagerRemote</className> <differenceType>7012</differenceType> <!-- method added to an interface --> - <method>void unassignBundlesFromBundleGroup(org.rhq.core.domain.auth.Subject, int[], int[])</method> + <method>void unassignBundlesFromBundleGroups(org.rhq.core.domain.auth.Subject, int[], int[])</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference>
<difference> <className>org/rhq/enterprise/server/bundle/BundleManagerRemote</className> <differenceType>7012</differenceType> <!-- method added to an interface --> - <method>org.rhq.core.domain.bundle.BundleGroup updateBundleGroup(org.rhq.core.domain.auth.Subject subject, org.rhq.core.domain.bundle.BundleGroup bundleGroup)</method> + <method>org.rhq.core.domain.bundle.BundleGroup updateBundleGroup(org.rhq.core.domain.auth.Subject subject, org.rhq.core.domain.bundle.BundleGroup)</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference>
rhq-commits@lists.fedorahosted.org