Alexander Wels has uploaded a new change for review.
Change subject: webadmin: permission sub sub tab
......................................................................
webadmin: permission sub sub tab
- Due to the GIN changes some of the permission models where not
properly instantiated, this patch fixes the problem for the
- Cpu Profile sub tab.
- Disk Profile sub tab.
Change-Id: I0d42952f82215a51c5b48f9ecf5bf1450b75ef72
Signed-off-by: Alexander Wels <aw...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionWithInheritedPermissionListModelTable.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/CpuProfileListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/DiskProfileListModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/ClusterModule.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/StorageModule.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/CpuProfilesListModelTable.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/DiskProfilesListModelTable.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/CpuProfilePermissionModelProvider.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/DiskProfilePermissionModelProvider.java
9 files changed, 21 insertions(+), 15 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/36815/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionWithInheritedPermissionListModelTable.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionWithInheritedPermissionListModelTable.java
index 297b7a0..e930bdd 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionWithInheritedPermissionListModelTable.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionWithInheritedPermissionListModelTable.java
@@ -10,7 +10,7 @@
import com.google.gwt.event.shared.EventBus;
-public class PermissionWithInheritedPermissionListModelTable<P extends
PermissionListModel> extends PermissionListModelTable<P> {
+public class PermissionWithInheritedPermissionListModelTable<P extends
PermissionListModel<?>> extends PermissionListModelTable<P> {
public PermissionWithInheritedPermissionListModelTable(
SearchableTableModelProvider<Permissions, P> modelProvider,
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/CpuProfileListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/CpuProfileListModel.java
index deb936c9..87619b6 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/CpuProfileListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/CpuProfileListModel.java
@@ -7,7 +7,6 @@
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.ui.uicommonweb.help.HelpTag;
-import org.ovirt.engine.ui.uicommonweb.models.clusters.ClusterListModel;
import org.ovirt.engine.ui.uicommonweb.models.configure.PermissionListModel;
import org.ovirt.engine.ui.uicompat.ConstantsManager;
@@ -16,7 +15,7 @@
public class CpuProfileListModel extends ProfileListModel<CpuProfile, CpuQos,
VDSGroup> {
@Inject
- public CpuProfileListModel(final PermissionListModel<ClusterListModel>
permissionListModel) {
+ public CpuProfileListModel(final PermissionListModel<CpuProfileListModel>
permissionListModel) {
super(permissionListModel);
setTitle(ConstantsManager.getInstance().getConstants().cpuProfileTitle());
setHelpTag(HelpTag.cpu_profiles);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/DiskProfileListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/DiskProfileListModel.java
index 5bc1883..d5d75c5 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/DiskProfileListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/DiskProfileListModel.java
@@ -8,7 +8,6 @@
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.ui.uicommonweb.help.HelpTag;
import org.ovirt.engine.ui.uicommonweb.models.configure.PermissionListModel;
-import org.ovirt.engine.ui.uicommonweb.models.storage.StorageListModel;
import org.ovirt.engine.ui.uicompat.ConstantsManager;
import com.google.inject.Inject;
@@ -16,7 +15,7 @@
public class DiskProfileListModel extends ProfileListModel<DiskProfile,
StorageQos, StorageDomain> {
@Inject
- public DiskProfileListModel(final PermissionListModel<StorageListModel>
permissionListModel) {
+ public DiskProfileListModel(final
PermissionListModel<DiskProfileListModel> permissionListModel) {
super(permissionListModel);
setTitle(ConstantsManager.getInstance().getConstants().diskProfilesTitle());
setHelpTag(HelpTag.disk_profiles);
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/ClusterModule.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/ClusterModule.java
index 48d7226..f3de85c 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/ClusterModule.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/ClusterModule.java
@@ -301,6 +301,7 @@
bind(ClusterAffinityGroupListModel.class).in(Singleton.class);
bind(CpuProfileListModel.class).in(Singleton.class);
bind(new
TypeLiteral<PermissionListModel<ClusterListModel>>(){}).in(Singleton.class);
+ bind(new
TypeLiteral<PermissionListModel<CpuProfileListModel>>(){}).in(Singleton.class);
// Form Detail Models
bind(new TypeLiteral<DetailModelProvider<ClusterListModel,
ClusterServiceModel>>(){})
@@ -315,6 +316,9 @@
// Permission Detail Model
bind(new TypeLiteral<SearchableDetailModelProvider<Permissions,
ClusterListModel, PermissionListModel<ClusterListModel>>>(){})
.to(new
TypeLiteral<PermissionModelProvider<ClusterListModel>>(){}).in(Singleton.class);
+ // Cpu Profile permission list model
+ bind(new TypeLiteral<SearchableDetailModelProvider<Permissions,
CpuProfileListModel, PermissionListModel<CpuProfileListModel>>>(){})
+ .to(new
TypeLiteral<PermissionModelProvider<CpuProfileListModel>>(){}).in(Singleton.class);
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/StorageModule.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/StorageModule.java
index dda4d91..f676f4b 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/StorageModule.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/StorageModule.java
@@ -464,6 +464,7 @@
bind(StorageEventListModel.class).in(Singleton.class);
bind(DiskProfileListModel.class).in(Singleton.class);
bind(new
TypeLiteral<PermissionListModel<StorageListModel>>(){}).in(Singleton.class);
+ bind(new
TypeLiteral<PermissionListModel<DiskProfileListModel>>(){}).in(Singleton.class);
// Form Detail Models
bind(new TypeLiteral<DetailModelProvider<StorageListModel,
StorageGeneralModel>>(){})
@@ -478,6 +479,9 @@
// Permission Detail Model
bind(new TypeLiteral<SearchableDetailModelProvider<Permissions,
StorageListModel, PermissionListModel<StorageListModel>>>(){})
.to(new
TypeLiteral<PermissionModelProvider<StorageListModel>>(){}).in(Singleton.class);
+ // Permission Disk Profiles
+ bind(new TypeLiteral<SearchableDetailModelProvider<Permissions,
DiskProfileListModel, PermissionListModel<DiskProfileListModel>>>(){})
+ .to(new
TypeLiteral<PermissionModelProvider<DiskProfileListModel>>(){}).in(Singleton.class);
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/CpuProfilesListModelTable.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/CpuProfilesListModelTable.java
index 17c5ede..d26e2a5 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/CpuProfilesListModelTable.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/CpuProfilesListModelTable.java
@@ -38,7 +38,7 @@
ViewIdHandler idHandler = GWT.create(ViewIdHandler.class);
}
- private final
PermissionWithInheritedPermissionListModelTable<PermissionListModel>
permissionListModelTable;
+ private final
PermissionWithInheritedPermissionListModelTable<PermissionListModel<CpuProfileListModel>>
permissionListModelTable;
@UiField
SplitLayoutPanel splitLayoutPanel;
@@ -62,7 +62,7 @@
// Create permission panel
permissionListModelTable =
- new
PermissionWithInheritedPermissionListModelTable<PermissionListModel>(cpuProfilePermissionModelProvider,
+ new
PermissionWithInheritedPermissionListModelTable<PermissionListModel<CpuProfileListModel>>(cpuProfilePermissionModelProvider,
eventBus,
clientStorage);
permissionListModelTable.initTable(constants);
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/DiskProfilesListModelTable.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/DiskProfilesListModelTable.java
index e2ed2ca..1fc512d 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/DiskProfilesListModelTable.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/DiskProfilesListModelTable.java
@@ -36,7 +36,7 @@
WidgetUiBinder uiBinder = GWT.create(WidgetUiBinder.class);
}
- private final
PermissionWithInheritedPermissionListModelTable<PermissionListModel>
permissionListModelTable;
+ private final
PermissionWithInheritedPermissionListModelTable<PermissionListModel<DiskProfileListModel>>
permissionListModelTable;
@UiField
SplitLayoutPanel splitLayoutPanel;
@@ -62,7 +62,7 @@
// Create permission panel
permissionListModelTable =
- new
PermissionWithInheritedPermissionListModelTable<PermissionListModel>(diskProfilePermissionModelProvider,
+ new
PermissionWithInheritedPermissionListModelTable<PermissionListModel<DiskProfileListModel>>(diskProfilePermissionModelProvider,
eventBus,
clientStorage);
permissionListModelTable.initTable(constants);
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/CpuProfilePermissionModelProvider.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/CpuProfilePermissionModelProvider.java
index 0f6b7cd..2195bff 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/CpuProfilePermissionModelProvider.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/CpuProfilePermissionModelProvider.java
@@ -16,7 +16,7 @@
import com.google.inject.Inject;
import com.google.inject.Provider;
-public class CpuProfilePermissionModelProvider extends
SearchableDetailTabModelProvider<Permissions, CpuProfileListModel,
PermissionListModel> {
+public class CpuProfilePermissionModelProvider extends
SearchableDetailTabModelProvider<Permissions, CpuProfileListModel,
PermissionListModel<CpuProfileListModel>> {
private final Provider<PermissionsPopupPresenterWidget> popupProvider;
private final
Provider<RolePermissionsRemoveConfirmationPopupPresenterWidget>
removeConfirmPopupProvider;
@@ -32,7 +32,7 @@
}
@Override
- public AbstractModelBoundPopupPresenterWidget<? extends Model, ?>
getModelPopup(PermissionListModel source,
+ public AbstractModelBoundPopupPresenterWidget<? extends Model, ?>
getModelPopup(PermissionListModel<CpuProfileListModel> source,
UICommand lastExecutedCommand, Model windowModel) {
if (lastExecutedCommand.equals(getModel().getAddCommand())) {
return popupProvider.get();
@@ -42,7 +42,7 @@
}
@Override
- public AbstractModelBoundPopupPresenterWidget<? extends ConfirmationModel,
?> getConfirmModelPopup(PermissionListModel source,
+ public AbstractModelBoundPopupPresenterWidget<? extends ConfirmationModel,
?> getConfirmModelPopup(PermissionListModel<CpuProfileListModel> source,
UICommand lastExecutedCommand) {
if (lastExecutedCommand.equals(getModel().getRemoveCommand())) {
return removeConfirmPopupProvider.get();
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/DiskProfilePermissionModelProvider.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/DiskProfilePermissionModelProvider.java
index 9a9ed65..dc4fa69 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/DiskProfilePermissionModelProvider.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/DiskProfilePermissionModelProvider.java
@@ -16,7 +16,7 @@
import com.google.inject.Inject;
import com.google.inject.Provider;
-public class DiskProfilePermissionModelProvider extends
SearchableDetailTabModelProvider<Permissions, DiskProfileListModel,
PermissionListModel> {
+public class DiskProfilePermissionModelProvider extends
SearchableDetailTabModelProvider<Permissions, DiskProfileListModel,
PermissionListModel<DiskProfileListModel>> {
private final Provider<PermissionsPopupPresenterWidget> popupProvider;
private final
Provider<RolePermissionsRemoveConfirmationPopupPresenterWidget>
removeConfirmPopupProvider;
@@ -32,7 +32,7 @@
}
@Override
- public AbstractModelBoundPopupPresenterWidget<? extends Model, ?>
getModelPopup(PermissionListModel source,
+ public AbstractModelBoundPopupPresenterWidget<? extends Model, ?>
getModelPopup(PermissionListModel<DiskProfileListModel> source,
UICommand lastExecutedCommand, Model windowModel) {
if (lastExecutedCommand.equals(getModel().getAddCommand())) {
return popupProvider.get();
@@ -42,7 +42,7 @@
}
@Override
- public AbstractModelBoundPopupPresenterWidget<? extends ConfirmationModel,
?> getConfirmModelPopup(PermissionListModel source,
+ public AbstractModelBoundPopupPresenterWidget<? extends ConfirmationModel,
?> getConfirmModelPopup(PermissionListModel<DiskProfileListModel> source,
UICommand lastExecutedCommand) {
if (lastExecutedCommand.equals(getModel().getRemoveCommand())) {
return removeConfirmPopupProvider.get();
--
To view, visit http://gerrit.ovirt.org/36815
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d42952f82215a51c5b48f9ecf5bf1450b75ef72
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <aw...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
