Yair Zaslavsky has uploaded a new change for review.
Change subject: aaa: Reorder "namespace" and "authz" columns
......................................................................
aaa: Reorder "namespace" and "authz" columns
Change-Id: Ifa8b5de8c64231f35a603f12b8f710b6f10130f2
Topic: AAA
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionListModelTable.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/SystemPermissionView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabUserView.java
3 files changed, 26 insertions(+), 27 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/31532/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionListModelTable.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionListModelTable.java
index 4e2d92b..4b4a84d 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionListModelTable.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionListModelTable.java
@@ -25,8 +25,6 @@
public void initTable(CommonApplicationConstants constants) {
getTable().enableColumnResizing();
- getTable().addColumn(new PermissionTypeColumn(), constants.empty(),
"30px"); //$NON-NLS-1$
-
TextColumnWithTooltip<Permissions> userColumn = new
TextColumnWithTooltip<Permissions>() {
@Override
public String getValue(Permissions object) {
@@ -36,14 +34,6 @@
userColumn.makeSortable();
getTable().addColumn(userColumn, constants.userPermission(), "300px");
//$NON-NLS-1$
- TextColumnWithTooltip<Permissions> namespaceColumn = new
TextColumnWithTooltip<Permissions>() {
- @Override
- public String getValue(Permissions object) {
- return object.getNamespace();
- }
- };
- namespaceColumn.makeSortable();
- getTable().addColumn(namespaceColumn, constants.namespace(), "300px");
//$NON-NLS-1$
TextColumnWithTooltip<Permissions> authzColumn = new
TextColumnWithTooltip<Permissions>() {
@Override
@@ -54,7 +44,16 @@
authzColumn.makeSortable();
getTable().addColumn(authzColumn, constants.authz(), "300px");
//$NON-NLS-1$
+ getTable().addColumn(new PermissionTypeColumn(), constants.empty(),
"30px"); //$NON-NLS-1$
+ TextColumnWithTooltip<Permissions> namespaceColumn = new
TextColumnWithTooltip<Permissions>() {
+ @Override
+ public String getValue(Permissions object) {
+ return object.getNamespace();
+ }
+ };
+ namespaceColumn.makeSortable();
+ getTable().addColumn(namespaceColumn, constants.namespace(), "300px");
//$NON-NLS-1$
TextColumnWithTooltip<Permissions> roleColumn = new
TextColumnWithTooltip<Permissions>() {
@Override
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/SystemPermissionView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/SystemPermissionView.java
index df054b1..37d7002 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/SystemPermissionView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/SystemPermissionView.java
@@ -80,14 +80,6 @@
};
table.addColumn(userColumn, constants.userPermission(), "300px");
//$NON-NLS-1$
- TextColumnWithTooltip<Permissions> namespaceColumn = new
TextColumnWithTooltip<Permissions>() {
- @Override
- public String getValue(Permissions object) {
- return object.getNamespace();
- }
- };
- table.addColumn(namespaceColumn, constants.namespace(), "200px");
//$NON-NLS-1$
-
TextColumnWithTooltip<Permissions> authzColumn = new
TextColumnWithTooltip<Permissions>() {
@Override
public String getValue(Permissions object) {
@@ -96,6 +88,14 @@
};
table.addColumn(authzColumn, constants.authz(), "200px"); //$NON-NLS-1$
+ TextColumnWithTooltip<Permissions> namespaceColumn = new
TextColumnWithTooltip<Permissions>() {
+ @Override
+ public String getValue(Permissions object) {
+ return object.getNamespace();
+ }
+ };
+ table.addColumn(namespaceColumn, constants.namespace(), "200px");
//$NON-NLS-1$
+
TextColumnWithTooltip<Permissions> roleColumn = new
TextColumnWithTooltip<Permissions>() {
@Override
public String getValue(Permissions object) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabUserView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabUserView.java
index 239ea70..cdaa278 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabUserView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabUserView.java
@@ -63,15 +63,6 @@
userNameColumn.makeSortable(VdcUserConditionFieldAutoCompleter.USER_NAME);
getTable().addColumn(userNameColumn, constants.userNameUser(),
"150px"); //$NON-NLS-1$
- TextColumnWithTooltip<DbUser> namespaceColumn = new
TextColumnWithTooltip<DbUser>() {
- @Override
- public String getValue(DbUser object) {
- return object.getNamespace();
- }
- };
- namespaceColumn.makeSortable();
- getTable().addColumn(namespaceColumn, constants.namespace(), "150px");
//$NON-NLS-1$
-
TextColumnWithTooltip<DbUser> authzColumn = new
TextColumnWithTooltip<DbUser>() {
@Override
public String getValue(DbUser object) {
@@ -81,6 +72,15 @@
authzColumn.makeSortable();
getTable().addColumn(authzColumn, constants.authz(), "150px");
//$NON-NLS-1$
+ TextColumnWithTooltip<DbUser> namespaceColumn = new
TextColumnWithTooltip<DbUser>() {
+ @Override
+ public String getValue(DbUser object) {
+ return object.getNamespace();
+ }
+ };
+ namespaceColumn.makeSortable();
+ getTable().addColumn(namespaceColumn, constants.namespace(), "150px");
//$NON-NLS-1$
+
TextColumnWithTooltip<DbUser> groupColumn = new
TextColumnWithTooltip<DbUser>() {
@Override
public String getValue(DbUser object) {
--
To view, visit http://gerrit.ovirt.org/31532
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa8b5de8c64231f35a603f12b8f710b6f10130f2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
