modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
| 14 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
| 40 +++++++++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
| 6 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java
| 6 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java
| 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTransferImgButton.java
| 2
7 files changed, 62 insertions(+), 10 deletions(-)
New commits:
commit 619f762d39898ef3f8e8f3e16f1fd79000a64206
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Tue Aug 24 15:44:02 2010 -0400
Pass detail viewpath events down to the edit users details view
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
index 5779155..053c330 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
@@ -55,6 +55,7 @@ public class AdministrationView extends HLayout implements
BookmarkableView {
private SectionStack sectionStack;
private Canvas contentCanvas;
+ private Canvas currentContent;
private LinkedHashMap<String, TreeGrid> treeGrids = new
LinkedHashMap<String, TreeGrid>();
@Override
@@ -201,6 +202,7 @@ public class AdministrationView extends HLayout implements
BookmarkableView {
contentCanvas.addChild(newContent);
contentCanvas.markForRedraw();
+ currentContent = newContent;
}
private void renderContentView(ViewPath viewPath) {
@@ -272,9 +274,6 @@ public class AdministrationView extends HLayout implements
BookmarkableView {
setContent(content);
- if (content instanceof BookmarkableView) {
- ((BookmarkableView) content).renderView(viewPath.next().next());
- }
}
@@ -290,6 +289,15 @@ public class AdministrationView extends HLayout implements
BookmarkableView {
}
}
+ // When looking at a detail view, always fire the event down
+ if (!viewPath.isEnd()) {
+
+ if (currentContent instanceof BookmarkableView) {
+ ((BookmarkableView) currentContent).renderView(viewPath.next().next());
+ }
+
+ }
+
}
private static String addQueryStringParam(String url, String param) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
index 6042b4f..f5af5a9 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
@@ -43,7 +43,12 @@ import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Role;
+import org.rhq.core.domain.criteria.SubjectCriteria;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ViewId;
+import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.HeaderLabel;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
@@ -51,7 +56,7 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
/**
* @author Greg Hinkle
*/
-public class UserEditView extends VLayout {
+public class UserEditView extends VLayout implements BookmarkableView {
private Label message = new Label("Select a user to edit...");
@@ -249,4 +254,37 @@ public class UserEditView extends VLayout {
}
+ private void editSubject(int subjectId, final ViewId current) {
+
+ SubjectCriteria criteria = new SubjectCriteria();
+ criteria.fetchRoles(true);
+ criteria.fetchConfiguration(true);
+
+ GWTServiceLookup.getSubjectService().findSubjectsByCriteria(criteria,
+ new AsyncCallback<PageList<Subject>>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError("Failed to load
subject for editing",caught);
+ }
+
+ @Override
+ public void onSuccess(PageList<Subject> result) {
+ Subject subject = result.get(0);
+ Record record = new UsersDataSource().copyValues(subject);
+ editRecord(record);
+
+ current.getBreadcrumbs().get(0).setDisplayName("Editing:
" + subject.getName());
+ CoreGUI.refreshBreadCrumbTrail();
+ }
+ });
+ }
+
+ @Override
+ public void renderView(ViewPath viewPath) {
+ int userId = viewPath.getCurrentAsInt();
+
+
+
+ editSubject(userId, viewPath.getCurrent());
+ }
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
index b194c1e..441fcd5 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
@@ -23,11 +23,12 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
+import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
/**
* @author Greg Hinkle
*/
-public class UsersView extends Table {
+public class UsersView extends TableSection {
public UsersView() {
super("Users View");
commit 2dd748dd227a1d95ee097d43cc6986e3fe9e3d0a
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Tue Aug 24 15:43:32 2010 -0400
Missed commenting id set in this one
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTransferImgButton.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTransferImgButton.java
index e254411..5578676 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTransferImgButton.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTransferImgButton.java
@@ -18,7 +18,7 @@ public class LocatableTransferImgButton extends TransferImgButton {
public LocatableTransferImgButton(TransferImg img) {
super(img);
String locatorId = this.getScClassName() + "-" + getSuffix(img);
- setID(SeleniumUtility.getSafeId(locatorId, locatorId));
+// setID(SeleniumUtility.getSafeId(locatorId, locatorId));
}
private String getSuffix(TransferImg img) {
commit d26766966fbe0ab22af2bb8ad6b48f99547490cc
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Tue Aug 24 14:57:14 2010 -0400
Forgot to fire breadcrumb redraw for detail view
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java
index 3a7715f..7206815 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java
@@ -83,6 +83,7 @@ public class OperationDetailsView extends VLayout implements
BookmarkableView {
if (this.viewId != null) {
viewId.getBreadcrumbs().get(0).setDisplayName(operationHistory.getOperationDefinition().getDisplayName());
+ CoreGUI.refreshBreadCrumbTrail();
}
this.definition = operationHistory.getOperationDefinition();
commit e82481ac4520999dc005cc075d9204334e96538b
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Tue Aug 24 14:56:57 2010 -0400
Refactored for new list grid system
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java
index 47bfa5f..c831c34 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java
@@ -24,6 +24,7 @@ import com.smartgwt.client.types.SelectionStyle;
import com.smartgwt.client.types.SortDirection;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
+
import org.rhq.core.domain.criteria.MeasurementDataTraitCriteria;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
@@ -49,9 +50,10 @@ public abstract class AbstractMeasurementDataTraitListView extends
Table {
return (AbstractMeasurementDataTraitDataSource) super.getDataSource();
}
+
@Override
- protected void onInit() {
- super.onInit();
+ protected void configureTable() {
+ super.configureTable();
ListGrid listGrid = getListGrid();
listGrid.setSelectionType(SelectionStyle.SINGLE);
commit 276a5081829334fe01885cab112676cd14d9678f
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Tue Aug 24 14:56:22 2010 -0400
Workaround exception thrown when trying to determine if component has been drawn (in
debug mode)
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
index 9ecdc6c..a607496 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
@@ -76,7 +76,7 @@ public class SubTabLayout extends VLayout {
for (final String title : subtabs.keySet()) {
if (currentlySelected == null) {
- currentlyDisplayed = subtabs.get(title);
+// currentlyDisplayed = subtabs.get(title);
currentlySelected = title;
}
@@ -157,8 +157,10 @@ public class SubTabLayout extends VLayout {
}
private void draw(Canvas canvas) {
- if (currentlyDisplayed != null && currentlyDisplayed != canvas &&
currentlyDisplayed.isDrawn()) {
+ if (currentlyDisplayed != null && currentlyDisplayed != canvas) {
+ try {
currentlyDisplayed.hide();
+ } catch (Exception e) { } // ignore this
}
if (canvas != null) {
Show replies by date