Hello Yair Zaslavsky,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/31781
to review the following change.
Change subject: aaa: Rename "domain" in ui
......................................................................
aaa: Rename "domain" in ui
1. Rename "domain" to "profile" at login screen.
2. Rename "domain" to "authorization provider" at the
"User general" sub tab.
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1120720
Change-Id: Iea9ac1a2d983e244c77e34d7e076aa110e3f6d29
Topic: AAA
Signed-off-by: Yair Zaslavsky <[email protected]>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractLoginPresenterWidget.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginFormView.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginFormView.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginFormView.ui.xml
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginFormView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginFormView.ui.xml
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGroupView.java
12 files changed, 38 insertions(+), 43 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/31781/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractLoginPresenterWidget.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractLoginPresenterWidget.java
index 8d0ef55..a94f11a 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractLoginPresenterWidget.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractLoginPresenterWidget.java
@@ -120,7 +120,7 @@
}));
// Update selected domain after domain items have been set
- loginModel.getDomain().getPropertyChangedEvent().addListener(new
IEventListener() {
+ loginModel.getProfile().getPropertyChangedEvent().addListener(new
IEventListener() {
@SuppressWarnings("unchecked")
@Override
public void eventRaised(Event ev, Object sender, EventArgs args) {
@@ -134,9 +134,9 @@
return;
}
- for (String item : loginModel.getDomain().getItems()) {
+ for (String item : loginModel.getProfile().getItems()) {
if (previouslySelectedItem.equals(item)) {
- loginModel.getDomain().setSelectedItem(item);
+ loginModel.getProfile().setSelectedItem(item);
break;
}
}
@@ -163,7 +163,7 @@
}
void saveSelectedDomain(T loginModel) {
- String selectedItem = loginModel.getDomain().getSelectedItem();
+ String selectedItem = loginModel.getProfile().getSelectedItem();
if (selectedItem == null || "".equals(selectedItem)) { //$NON-NLS-1$
return;
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginFormView.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginFormView.java
index 607f0d8..c0ec425 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginFormView.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginFormView.java
@@ -60,9 +60,9 @@
public StringEntityModelPasswordBoxEditor passwordEditor;
@UiField
- @Path("domain.selectedItem")
- @WithElementId("domain")
- public ListModelListBoxEditor<String> domainEditor;
+ @Path("profile.selectedItem")
+ @WithElementId("profile")
+ public ListModelListBoxEditor<String> profileEditor;
@UiField
@WithElementId
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java
index 671de34..ffce974 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.ui.uicommonweb.models;
+import java.util.Collections;
import java.util.List;
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
@@ -63,16 +64,16 @@
privateLoginCommand = value;
}
- private ListModel<String> privateDomain;
+ private ListModel<String> privateProfile;
- public ListModel<String> getDomain()
+ public ListModel<String> getProfile()
{
- return privateDomain;
+ return privateProfile;
}
- private void setDomain(ListModel<String> value)
+ private void setProfile(ListModel<String> value)
{
- privateDomain = value;
+ privateProfile = value;
}
private EntityModel<String> privateUserName;
@@ -157,8 +158,8 @@
setLoginCommand(tempVar);
getCommands().add(tempVar);
- setDomain(new ListModel<String>());
- getDomain().setIsChangable(false);
+ setProfile(new ListModel<String>());
+ getProfile().setIsChangable(false);
setUserName(new EntityModel<String>());
getUserName().setIsChangable(false);
getUserName().getEntityChangedEvent().addListener(this);
@@ -195,11 +196,12 @@
loginModel.getLoginCommand().setIsExecutionAllowed(true);
loginModel.getUserName().setIsChangable(true);
loginModel.getPassword().setIsChangable(true);
- loginModel.getDomain().setIsChangable(true);
+ loginModel.getProfile().setIsChangable(true);
}
List<String> domains = (List<String>) ReturnValue;
- loginModel.getDomain().setItems(domains);
+ Collections.sort(domains);
+ loginModel.getProfile().setItems(domains);
}
};
@@ -219,7 +221,7 @@
private void userName_EntityChanged()
{
- getDomain().setIsChangable(getDomainAvailability());
+ getProfile().setIsChangable(getDomainAvailability());
}
private boolean getDomainAvailability()
@@ -280,7 +282,7 @@
loginModel.setMessage(Linq.firstOrDefault(returnValue.getCanDoActionMessages()));
loginModel.getUserName().setIsChangable(true);
loginModel.getPassword().setIsChangable(true);
- loginModel.getDomain().setIsChangable(true);
+ loginModel.getProfile().setIsChangable(true);
loginModel.getLoginCommand().setIsExecutionAllowed(true);
loginModel.getLoginFailedEvent().raise(this,
EventArgs.EMPTY);
}
@@ -293,7 +295,7 @@
}
};
Frontend.getInstance().loginAsync(fullUserName,
getPassword().getEntity(),
- StringHelper.isNullOrEmpty(domain) ?
getDomain().getSelectedItem() : domain, true,
+ StringHelper.isNullOrEmpty(domain) ?
getProfile().getSelectedItem() : domain, true,
_asyncQuery);
}
@@ -306,7 +308,7 @@
{
loggingInAutomatically = true;
getUserName().setEntity(user.getLoginName());
- getDomain().setSelectedItem(user.getDomain());
+ getProfile().setSelectedItem(user.getDomain());
disableLoginScreen();
setLoggedUser(user);
Frontend.getInstance().setLoggedInUser(user);
@@ -316,7 +318,7 @@
protected void disableLoginScreen() {
getUserName().setIsChangable(false);
getPassword().setIsChangable(false);
- getDomain().setIsChangable(false);
+ getProfile().setIsChangable(false);
getLoginCommand().setIsExecutionAllowed(false);
}
@@ -324,9 +326,9 @@
{
getUserName().validateEntity(new IValidation[] { new
NotEmptyValidation() });
getPassword().validateEntity(new IValidation[] { new
NotEmptyValidation() });
- getDomain().validateSelectedItem(new IValidation[] { new
NotEmptyValidation() });
+ getProfile().validateSelectedItem(new IValidation[] { new
NotEmptyValidation() });
- return getUserName().getIsValid() && getPassword().getIsValid() &&
getDomain().getIsValid();
+ return getUserName().getIsValid() && getPassword().getIsValid() &&
getProfile().getIsValid();
}
@Override
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java
index bf8dc7b..769d26b 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java
@@ -188,7 +188,7 @@
getUserName().setIsChangable(false);
getPassword().setIsChangable(false);
- getDomain().setIsChangable(false);
+ getProfile().setIsChangable(false);
getLoginCommand().setIsExecutionAllowed(false);
getIsAutoConnect().setIsChangable(false);
@@ -210,7 +210,7 @@
}
loginModel.getUserName().setIsChangable(true);
loginModel.getPassword().setIsChangable(true);
- loginModel.getDomain().setIsChangable(true);
+ loginModel.getProfile().setIsChangable(true);
loginModel.getLoginCommand().setIsExecutionAllowed(true);
getIsAutoConnect().setIsChangable(true);
loginModel.getLoginFailedEvent().raise(this,
EventArgs.EMPTY);
@@ -219,7 +219,7 @@
}
};
Frontend.getInstance().loginAsync(getUserName().getEntity(),
getPassword().getEntity(),
- getDomain().getSelectedItem(),
false, asyncQuery);
+ getProfile().getSelectedItem(),
false, asyncQuery);
}
private void changePassword()
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java
index 676939f..00da5b6 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java
@@ -26,8 +26,8 @@
@DefaultStringValue("Password")
String loginFormPasswordLabel();
- @DefaultStringValue("Domain")
- String loginFormDomainLabel();
+ @DefaultStringValue("Profile")
+ String loginFormProfileLabel();
@DefaultStringValue("Login")
String loginButtonLabel();
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginFormView.java
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginFormView.java
index 5908c8a..5f5e56b 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginFormView.java
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginFormView.java
@@ -116,7 +116,7 @@
ApplicationDynamicMessages dynamicMessages) {
userNameEditor.setLabel(constants.loginFormUserNameLabel());
passwordEditor.setLabel(constants.loginFormPasswordLabel());
- domainEditor.setLabel(constants.loginFormDomainLabel());
+ profileEditor.setLabel(constants.loginFormProfileLabel());
connectAutomaticallyEditor.setLabel(constants.loginFormConnectAutomaticallyLabel());
loginButton.setLabel(constants.loginButtonLabel());
motdHeaderLabel.setText(constants.motdHeaderLabel());
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginFormView.ui.xml
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginFormView.ui.xml
index 4a91f20..3c985fc 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginFormView.ui.xml
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginFormView.ui.xml
@@ -96,7 +96,7 @@
<ge:StringEntityModelPasswordBoxEditor
ui:field="passwordEditor" usePatternFly="true" />
- <e:ListModelListBoxEditor ui:field="domainEditor"
usePatternFly="true" />
+ <e:ListModelListBoxEditor ui:field="profileEditor"
usePatternFly="true" />
<div>
<div class="col-xs-8 col-sm-offset-2 col-sm-6
col-md-offset-2 col-md-6">
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
index f3bd70f..3939e20 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
@@ -29,8 +29,8 @@
@DefaultStringValue("Password")
String loginFormPasswordLabel();
- @DefaultStringValue("Domain")
- String loginFormDomainLabel();
+ @DefaultStringValue("Profile")
+ String loginFormProfileLabel();
@DefaultStringValue("Login")
String loginButtonLabel();
@@ -1872,10 +1872,6 @@
@DefaultStringValue("Inherited From")
String inheritedFromUser();
- // User- general
- @DefaultStringValue("Domain")
- String domainUserGeneral();
-
@DefaultStringValue("Active")
String activeUserGeneral();
@@ -2251,9 +2247,6 @@
@DefaultStringValue("Namespace")
String namespaceGroup();
-
- @DefaultStringValue("Authorization provider")
- String authzGroup();
// Event notifier
@DefaultStringValue("Event Name")
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginFormView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginFormView.java
index ee82eee..e0a9d68 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginFormView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginFormView.java
@@ -56,7 +56,7 @@
ApplicationDynamicMessages dynamicMessages) {
userNameEditor.setLabel(constants.loginFormUserNameLabel());
passwordEditor.setLabel(constants.loginFormPasswordLabel());
- domainEditor.setLabel(constants.loginFormDomainLabel());
+ profileEditor.setLabel(constants.loginFormProfileLabel());
loginButton.setLabel(constants.loginButtonLabel());
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginFormView.ui.xml
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginFormView.ui.xml
index f1eb92c..207e086 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginFormView.ui.xml
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginFormView.ui.xml
@@ -85,7 +85,7 @@
<ge:StringEntityModelPasswordBoxEditor
ui:field="passwordEditor" usePatternFly="true" />
- <e:ListModelListBoxEditor ui:field="domainEditor"
usePatternFly="true" />
+ <e:ListModelListBoxEditor ui:field="profileEditor"
usePatternFly="true" />
<div class="form-group">
<div class="col-xs-8 col-sm-offset-2 col-sm-6
col-md-offset-2 col-md-6">
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java
index 2cc3877..566fa13 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java
@@ -57,7 +57,7 @@
// Build a form using the FormBuilder
formBuilder = new FormBuilder(formPanel, 1, 3);
- formBuilder.addFormItem(new FormItem(constants.domainUserGeneral(),
domain, 0, 0));
+ formBuilder.addFormItem(new FormItem(constants.authz(), domain, 0, 0));
formBuilder.addFormItem(new FormItem(constants.activeUserGeneral(),
active, 1, 0) {
@Override
public boolean getIsAvailable() {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGroupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGroupView.java
index e0eacdb..98b5bf5 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGroupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGroupView.java
@@ -50,7 +50,7 @@
}
};
authzColumn.makeSortable(UserGroupComparator.AUTHZ);
- getTable().addColumn(authzColumn, constants.authzGroup(), "300px");
//$NON-NLS-1$
+ getTable().addColumn(authzColumn, constants.authz(), "300px");
//$NON-NLS-1$
}
}
--
To view, visit http://gerrit.ovirt.org/31781
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea9ac1a2d983e244c77e34d7e076aa110e3f6d29
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Yair Zaslavsky <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
