modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java | 94 +++++++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java | 14 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceTypeGWTServiceImpl.java | 51 +++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 19 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerLocal.java | 2 modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java | 4 9 files changed, 180 insertions(+), 28 deletions(-)
New commits: commit b1865aee0517daa6fa7de2b7c7e9ee55710f27e9 Author: John Mazzitelli mazz@redhat.com Date: Tue Oct 12 00:10:57 2010 -0400
get the relative "start search from" drop down menu populated with the resource lineage types
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java index 28d2596..68c07f4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java @@ -41,6 +41,7 @@ import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.alert.notification.AlertNotification; +import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; @@ -224,14 +225,16 @@ public class NewNotificationEditor extends LocatableDynamicForm { newCanvas = new SystemRolesNotificationSenderForm(newLocatorId, notificationToEdit, sender); } else if ("Resource Operations".equals(sender)) { ResourceType rt; + Resource res = null; if (alertDefinition.getResourceType() != null) { rt = alertDefinition.getResourceType(); } else if (alertDefinition.getResourceGroup() != null) { rt = alertDefinition.getResourceGroup().getResourceType(); } else { - rt = alertDefinition.getResource().getResourceType(); + res = alertDefinition.getResource(); + rt = res.getResourceType(); } - newCanvas = new ResourceOperationNotificationSenderForm(newLocatorId, notificationToEdit, sender, rt); + newCanvas = new ResourceOperationNotificationSenderForm(newLocatorId, notificationToEdit, sender, rt, res); } else { // catch all - all other senders are assumed to just have simple configuration definition // that can be used by our configuration editor UI component to ask for config values. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java index f60cd9e..2519e6e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java @@ -23,6 +23,7 @@
package org.rhq.enterprise.gui.coregui.client.alert.definitions;
+import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Set; @@ -37,6 +38,7 @@ import com.smartgwt.client.widgets.form.fields.ButtonItem; import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.SelectItem; import com.smartgwt.client.widgets.form.fields.StaticTextItem; +import com.smartgwt.client.widgets.form.fields.TextItem; import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; import com.smartgwt.client.widgets.form.fields.events.ClickEvent; @@ -75,19 +77,23 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio private static final String OPERATION_DEFS_ATTRIBUTE = "operationDefinitions";
private final ResourceType resourceType; // the type representing the current resource or the current type being edited + private final Resource theResource; // if we are editing a resource instance, this is it - otherwise, will be null (for group/template alert defs)
private LocatableDynamicForm dynamicForm; private SelectItem modeSelectItem; private StaticTextItem singleResourceTextItem; private SelectItem ancestorTypeSelectItem; + private SelectItem descendantTypeSelectItem; + private TextItem descendantNameTextItem; private HLayout operationArgumentsCanvasItem; private SelectItem operationSelectItem;
public ResourceOperationNotificationSenderForm(String locatorId, AlertNotification notif, String sender, - ResourceType resourceType) { + ResourceType resourceType, Resource res) {
super(locatorId, notif, sender); this.resourceType = resourceType; + this.theResource = res; }
@Override @@ -156,9 +162,33 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio ancestorTypeSelectItem.setEndRow(true); ancestorTypeSelectItem.setWrapTitle(false); ancestorTypeSelectItem.setRedrawOnChange(true); - ancestorTypeSelectItem.setVisible(false); + ancestorTypeSelectItem.setDefaultToFirstOption(true); + ancestorTypeSelectItem.setHoverWidth(200); + ancestorTypeSelectItem + .setTooltip("Select the top of the type hierarchy from which to search its descedant tree for the Filter By type"); ancestorTypeSelectItem.setShowIfCondition(new ShowIfModeFunction(ResourceSelectionMode.RELATIVE));
+ descendantTypeSelectItem = new SelectItem("descendantTypeSelectItem", "Then Filter By"); + descendantTypeSelectItem.setStartRow(true); + descendantTypeSelectItem.setEndRow(false); + descendantTypeSelectItem.setWrapTitle(false); + descendantTypeSelectItem.setRedrawOnChange(true); + descendantTypeSelectItem.setDefaultToFirstOption(true); + descendantTypeSelectItem.setHoverWidth(200); + descendantTypeSelectItem + .setTooltip("The resource type to search for under the root type defined in the Start Search From selection."); + descendantTypeSelectItem.setShowIfCondition(new ShowIfModeFunction(ResourceSelectionMode.RELATIVE)); + + descendantNameTextItem = new TextItem("descendantNameTextItem"); + descendantNameTextItem.setStartRow(false); + descendantNameTextItem.setEndRow(true); + descendantNameTextItem.setShowTitle(false); + descendantNameTextItem.setRequired(false); + descendantNameTextItem + .setTooltip("A specific name to uniquely identify a resource when more than one resource of the selected type might exist. This is optional if there will only ever be one resource of the resource type in the selected type hierarchy."); + descendantNameTextItem.setHoverWidth(200); + descendantNameTextItem.setShowIfCondition(new ShowIfModeFunction(ResourceSelectionMode.RELATIVE)); + // the mode selector menu
modeSelectItem = new SelectItem("modeSelectItem", "Resource Selection Mode"); @@ -187,8 +217,12 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio break; } case RELATIVE: { - // TODO + ancestorTypeSelectItem.clearValue(); + descendantTypeSelectItem.clearValue(); + descendantNameTextItem.clearValue(); hideOperationDropDownMenu(); + populateRelativeAncestorDropDownMenu(null); + // TODO break; } } @@ -196,7 +230,7 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio });
dynamicForm.setFields(modeSelectItem, singleResourceTextItem, singleResourceButtonItem, ancestorTypeSelectItem, - operationSelectItem); + descendantTypeSelectItem, descendantNameTextItem, operationSelectItem);
addMember(dynamicForm); addMember(operationArgumentsCanvasItem); @@ -219,7 +253,12 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio break; } case RELATIVE: { + populateRelativeAncestorDropDownMenu(notifInfo.getAncestorTypeId()); // TODO + descendantTypeSelectItem.setValue(notifInfo.getDescendantTypeId()); + if (notifInfo.getDescendantName() != null) { + descendantNameTextItem.setValue(notifInfo.getDescendantName()); + } break; } } @@ -229,6 +268,39 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio } }
+ private void populateRelativeAncestorDropDownMenu(final Integer selectedResourceTypeId) { + if (ancestorTypeSelectItem.getValue() == null) { + AsyncCallback<ArrayList<ResourceType>> callback = new AsyncCallback<ArrayList<ResourceType>>() { + @Override + public void onSuccess(ArrayList<ResourceType> results) { + LinkedHashMap<String, String> map = new LinkedHashMap<String, String>(results.size()); + for (ResourceType rt : results) { + map.put(String.valueOf(rt.getId()), rt.getName()); + } + ancestorTypeSelectItem.setValueMap(map); + if (selectedResourceTypeId != null) { + ancestorTypeSelectItem.setValue(selectedResourceTypeId.toString()); + } else { + ancestorTypeSelectItem.setValue(String.valueOf(results.get(0).getId())); + } + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError("Cannot get type ancestry", caught); + } + }; + + if (this.theResource != null) { + GWTServiceLookup.getResourceTypeGWTService().getResourceTypesForResourceAncestors( + this.theResource.getId(), callback); + } else { + GWTServiceLookup.getResourceTypeGWTService().getAllResourceTypeAncestors(this.resourceType.getId(), + callback); + } + } + } + /** * This assumes the user or our code selected a specific operation from the drop down list. * This will show the operation arguments as appropriate for the selected operation. @@ -439,6 +511,7 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio // now fill in the configuration object with the information based on what was selected String selectedModeString = modeSelectItem.getValue().toString(); ResourceSelectionMode selectedMode = ResourceSelectionMode.valueOf(selectedModeString); + cleanConfiguration(); // erase anything previously in here Configuration config = getConfiguration(); config.put(new PropertySimple(ResourceOperationNotificationInfo.Constants.SELECTION_MODE .getPropertyName(), selectedMode)); @@ -454,7 +527,18 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio break; } case RELATIVE: { - // TODO + config.put(new PropertySimple(ResourceOperationNotificationInfo.Constants.RELATIVE_ANCESTOR_TYPE_ID + .getPropertyName(), ancestorTypeSelectItem.getValue())); + config.put(new PropertySimple( + ResourceOperationNotificationInfo.Constants.RELATIVE_DESCENDANT_TYPE_ID.getPropertyName(), + descendantTypeSelectItem.getValue())); + // descendant name is optional - only populate a non-null property + Object descandentNameString = descendantNameTextItem.getValue(); + if (descandentNameString != null && descandentNameString.toString().trim().length() > 0) { + config.put(new PropertySimple( + ResourceOperationNotificationInfo.Constants.RELATIVE_DESCENDANT_NAME.getPropertyName(), + descandentNameString)); + } break; } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java index 89255e4..2b2bd45 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java @@ -1,20 +1,22 @@ package org.rhq.enterprise.gui.coregui.client.gwt;
-import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.configuration.RawConfiguration; -import org.rhq.core.domain.criteria.ResourceTypeCriteria; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.util.PageList; +import java.util.ArrayList;
import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
+import org.rhq.core.domain.criteria.ResourceTypeCriteria; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.util.PageList; + @RemoteServiceRelativePath("ResourceTypeGWTService") public interface ResourceTypeGWTService extends RemoteService {
PageList<ResourceType> findResourceTypesByCriteria(ResourceTypeCriteria criteria);
- RawConfiguration dummy(RawConfiguration config); + ArrayList<ResourceType> getResourceTypesForResourceAncestors(int resourceId);
+ ArrayList<ResourceType> getAllResourceTypeAncestors(int resourceTypeId);
+ ArrayList<ResourceType> getResourceTypeDescendantsWithOperations(int resourceTypeId); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceTypeGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceTypeGWTServiceImpl.java index 4d6706c..e99d65d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceTypeGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceTypeGWTServiceImpl.java @@ -1,12 +1,16 @@ package org.rhq.enterprise.gui.coregui.server.gwt;
-import org.rhq.core.domain.configuration.RawConfiguration; +import java.util.ArrayList; +import java.util.List; + import org.rhq.core.domain.criteria.ResourceTypeCriteria; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.resource.composite.ResourceLineageComposite; import org.rhq.core.domain.util.PageList; import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTService; import org.rhq.enterprise.gui.coregui.server.util.SerialUtility; +import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; import org.rhq.enterprise.server.util.LookupUtil;
@@ -14,6 +18,7 @@ public class ResourceTypeGWTServiceImpl extends AbstractGWTServiceImpl implement
private static final long serialVersionUID = 1L;
+ @Override public PageList<ResourceType> findResourceTypesByCriteria(ResourceTypeCriteria criteria) { try { ResourceTypeManagerLocal typeManager = LookupUtil.getResourceTypeManager(); @@ -25,8 +30,46 @@ public class ResourceTypeGWTServiceImpl extends AbstractGWTServiceImpl implement } }
- public RawConfiguration dummy(RawConfiguration config) { - com.allen_sauer.gwt.log.client.Log.info(config.getPath()); - return new RawConfiguration(); + /** + * Given a resource ID, this gets all resource types for all ancestors in that resource's lineage. + */ + @Override + public ArrayList<ResourceType> getResourceTypesForResourceAncestors(int resourceId) { + try { + ResourceManagerLocal manager = LookupUtil.getResourceManager(); + List<ResourceLineageComposite> lineage = manager.getResourceLineage(getSessionSubject(), resourceId); + ArrayList<ResourceType> types = new ArrayList<ResourceType>(lineage.size()); + for (ResourceLineageComposite composite : lineage) { + types.add(composite.getResource().getResourceType()); + } + return SerialUtility.prepare(types, "ResourceTypes.getResourceTypesForResourceAncestors"); + } catch (Exception e) { + throw new RuntimeException(ThrowableUtil.getAllMessages(e)); + } + } + + @Override + public ArrayList<ResourceType> getAllResourceTypeAncestors(int resourceTypeId) { + try { + ResourceTypeManagerLocal typeManager = LookupUtil.getResourceTypeManager(); + List<ResourceType> list = typeManager.getAllResourceTypeAncestors(getSessionSubject(), resourceTypeId); + return SerialUtility + .prepare(new ArrayList<ResourceType>(list), "ResourceTypes.getAllResourceTypeAncestors"); + } catch (Exception e) { + throw new RuntimeException(ThrowableUtil.getAllMessages(e)); + } + } + + @Override + public ArrayList<ResourceType> getResourceTypeDescendantsWithOperations(int resourceTypeId) { + try { + ResourceTypeManagerLocal typeManager = LookupUtil.getResourceTypeManager(); + List<ResourceType> list = typeManager.getResourceTypeDescendantsWithOperations(getSessionSubject(), + resourceTypeId); + return SerialUtility.prepare(new ArrayList<ResourceType>(list), + "ResourceTypes.getResourceTypeDescendantsWithOperations"); + } catch (Exception e) { + throw new RuntimeException(ThrowableUtil.getAllMessages(e)); + } } } \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java index 379c69d..0c7198a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java @@ -798,6 +798,25 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage return result; }
+ public List<ResourceLineageComposite> getResourceLineage(Subject subject, int resourceId) { + boolean isInventoryManager = authorizationManager.isInventoryManager(subject); + + // get the raw resource lineage up to the platform. We'll check the auth below + List<Resource> rawLineage = getResourceLineage(resourceId); + + // record which of the raw ancestry is locked from view + List<ResourceLineageComposite> resourceLineage = new ArrayList<ResourceLineageComposite>(rawLineage.size()); + for (Resource resource : rawLineage) { + boolean isLocked = false; + if (!isInventoryManager) { + isLocked = !authorizationManager.canViewResource(subject, resource.getId()); + } + resourceLineage.add(new ResourceLineageComposite(resource, isLocked)); + } + + return resourceLineage; + } + @NotNull public Resource getRootResourceForResource(int resourceId) { Query q = entityManager.createNamedQuery(Resource.QUERY_FIND_ROOT_PLATFORM_OF_RESOURCE); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java index a94bcc4..0dccf06 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java @@ -156,6 +156,15 @@ public interface ResourceManagerLocal { List<Resource> getResourceLineage(int resourceId);
/** + * Returns the direct lineage of a resource up to the top most resource in the hierarchy. + * Composites are returned that indicate whether the resource is viewable or not by the user. + * + * @param resourceId id of resource + * @return resource lineage + */ + List<ResourceLineageComposite> getResourceLineage(Subject subject, int resourceId); + + /** * Returns the lineage of a resource plus all the siblings of the resources in the lineage. This is * useful for prepopulating all the resources visible in an expanded tree. Composites are returned * that indicate whether the resource is viewable or should be locked in the tree. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java index a2a6ece..9dc348c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java @@ -415,8 +415,6 @@ public class ResourceTypeManagerBean implements ResourceTypeManagerLocal, Resour @SuppressWarnings("unchecked") public PageList<ResourceType> findResourceTypesByCriteria(Subject subject, ResourceTypeCriteria criteria) { CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria); - ; - CriteriaQueryRunner<ResourceType> queryRunner = new CriteriaQueryRunner(criteria, generator, entityManager); return queryRunner.execute(); } @@ -428,12 +426,6 @@ public class ResourceTypeManagerBean implements ResourceTypeManagerLocal, Resour return results; }
- public List<ResourceType> getResourceTypeAncestorsWithOperations(Subject subject, int resourceTypeId) { - List<ResourceType> types = getAllResourceTypeAncestors(subject, resourceTypeId); - List<ResourceType> results = excludeThoseWithoutOperations(types); - return results; - } - public List<ResourceType> getResourceTypeDescendantsWithOperations(Subject subject, int resourceTypeId) { List<ResourceType> types = getAllResourceTypeDescendants(subject, resourceTypeId); List<ResourceType> results = excludeThoseWithoutOperations(types); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerLocal.java index 709f9f0..6cd3639 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerLocal.java @@ -133,8 +133,6 @@ public interface ResourceTypeManagerLocal {
ResourceType getResourceTypeByNameAndPlugin(Subject subject, String name, String plugin);
- List<ResourceType> getResourceTypeAncestorsWithOperations(Subject subject, int resourceTypeId); - List<ResourceType> getResourceTypeDescendantsWithOperations(Subject subject, int resourceTypeId);
List<ResourceType> getAllResourceTypeAncestors(Subject subject, int resourceTypeId); diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java index 1552256..2d85548 100644 --- a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java +++ b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java @@ -109,7 +109,9 @@ public class OperationsBackingBean extends CustomAlertSenderBackingBean { }
if (ancestors == null) { // if not in the resource content or fallback if resource ancestry loading bombs - ancestors = LookupUtil.getResourceTypeManager().getResourceTypeAncestorsWithOperations(getOverlord(), + // mazz was here - I replaced getResourceTypeAcestorsWithOperations - this entire backing bean + // will be deleted soon, so we don't care - i just needed to get this to compile again + ancestors = LookupUtil.getResourceTypeManager().getAllResourceTypeAncestors(getOverlord(), contextType.getId()); } load(ancestorTypeOptions, ancestors);
rhq-commits@lists.fedorahosted.org