Greg Sheremeta has uploaded a new change for review. Change subject: webadmin: update search string on bookmark selection ......................................................................
webadmin: update search string on bookmark selection After editing a bookmark name, that bookmark wasn't being properly cleared of its selection. The UI component was no longer selected, but the model thought it was still selected. So re-clicking that bookmark had no effect. Fixed by properly clearing the bookmark selection on bookmark save. Change-Id: Ic9763ab32eb3fcef7375553e7b9e264899583a1d Bug-Url: https://bugzilla.redhat.com/996611 Signed-off-by: Greg Sheremeta <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/BookmarkModelProvider.java 2 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/19812/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java index 96a49fb..d33e5ab 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java @@ -24,6 +24,7 @@ import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel; import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.Event; +import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.EventDefinition; import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult; import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback; @@ -48,6 +49,9 @@ private static final BookmarksComparator COMPARATOR = new BookmarksComparator(); public static EventDefinition NavigatedEventDefinition; + + public static EventDefinition SavedEventDefinition; + private Event privateNavigatedEvent; public Event getNavigatedEvent() @@ -109,14 +113,28 @@ privateIsBookmarkInitiated = value; } + private Event privateItemSavedEvent; + + public Event getItemSavedEvent() + { + return privateItemSavedEvent; + } + + private void setItemSavedEvent(Event value) + { + privateItemSavedEvent = value; + } + static { NavigatedEventDefinition = new EventDefinition("Navigated", BookmarkListModel.class); //$NON-NLS-1$ + SavedEventDefinition = new EventDefinition("Saved", BookmarkListModel.class); //$NON-NLS-1$ } public BookmarkListModel() { setNavigatedEvent(new Event(NavigatedEventDefinition)); + setItemSavedEvent(new Event(SavedEventDefinition)); setNewCommand(new UICommand("New", this)); //$NON-NLS-1$ setEditCommand(new UICommand("Edit", this)); //$NON-NLS-1$ @@ -310,6 +328,8 @@ // Cancel() triggers a force refresh // getSearchCommand().Execute(); } + + privateItemSavedEvent.raise(this, EventArgs.Empty); } public void cancel() diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/BookmarkModelProvider.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/BookmarkModelProvider.java index c4f7d76..f0590b5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/BookmarkModelProvider.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/BookmarkModelProvider.java @@ -108,6 +108,14 @@ } }); + // Clear tag selection when a tag is saved/edited/deleted + getModel().getItemSavedEvent().addListener(new IEventListener() { + @Override + public void eventRaised(Event ev, Object sender, EventArgs args) { + clearSelection(); + } + }); + } void clearSelection() { -- To view, visit http://gerrit.ovirt.org/19812 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9763ab32eb3fcef7375553e7b9e264899583a1d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Greg Sheremeta <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
