modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java
| 7 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
| 25 ++++++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
| 5 +-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
| 8 ++-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
| 9 +++
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
| 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
| 17 ++++++
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
| 3 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
| 10 ++++
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
| 22 ++++----
11 files changed, 91 insertions(+), 19 deletions(-)
New commits:
commit f126a952186530d6e0e84afca704862e9a0a8f60
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Jul 25 15:45:30 2013 -0400
More work on working new bundle group stuff into role edit view. Also, continued
cleanup of Messages.properties.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java
index 5b009b5..88fb948 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java
@@ -228,15 +228,22 @@ public enum Permission {
public static final Set<Permission> GLOBAL_ALL = new
HashSet<Permission>();
public static final Set<Permission> RESOURCE_ALL = new
HashSet<Permission>();
+ public static final Set<Permission> BUNDLE_ALL = new
HashSet<Permission>();
static {
for (Permission permission : Permission.values()) {
switch (permission.getTarget()) {
case GLOBAL:
GLOBAL_ALL.add(permission);
+ if (permission.name().contains("BUNDLE")) {
+ BUNDLE_ALL.add(permission);
+ }
break;
case RESOURCE:
RESOURCE_ALL.add(permission);
break;
+ case BUNDLE:
+ BUNDLE_ALL.add(permission);
+ break;
}
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
index cde2c6d..5e80d82 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
@@ -101,6 +101,11 @@ public class PermissionsEditor extends EnhancedVStack {
this.resourcePermissionsGrid = createResourcePermissionsGrid();
addMember(this.resourcePermissionsGrid);
+ Label bundleGroupPermissionsHeader = new Label("<h4>"
+ + MSG.view_adminRoles_permissions_bundleGroupPermissions() +
"</h4>");
+ bundleGroupPermissionsHeader.setHeight(17);
+ addMember(bundleGroupPermissionsHeader);
+
this.bundleGroupPermissionsGrid = createBundleGroupPermissionsGrid();
addMember(this.bundleGroupPermissionsGrid);
@@ -135,6 +140,13 @@ public class PermissionsEditor extends EnhancedVStack {
record.setAttribute("writeAuthorized",
this.selectedPermissions.contains(writePermission));
}
+ ListGridRecord[] bundleGroupPermissionRecords =
this.bundleGroupPermissionsGrid.getRecords();
+ for (ListGridRecord record : bundleGroupPermissionRecords) {
+ String permissionName = record.getAttribute("name");
+ Permission permission = Permission.valueOf(permissionName);
+ record.setAttribute("authorized",
this.selectedPermissions.contains(permission));
+ }
+
markForRedraw();
}
@@ -216,7 +228,6 @@ public class PermissionsEditor extends EnhancedVStack {
MSG.view_adminRoles_permissions_permDesc_deployBundles());
records.add(record);
-
record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_viewUsers(),
"global/User",
Permission.VIEW_USERS,
MSG.view_adminRoles_permissions_permDesc_viewUsers());
records.add(record);
@@ -481,6 +492,12 @@ public class PermissionsEditor extends EnhancedVStack {
messageString =
MSG.view_adminRoles_permissions_autoselecting_configureWrite_implied();
redrawRequired = true;
}
+ } else if (permission == Permission.MANAGE_BUNDLE) {
+ // MANAGE_BUNDLE implies all other bundle-related perms
+ if (this.selectedPermissions.addAll(Permission.BUNDLE_ALL)) {
+ messageString =
MSG.view_adminRoles_permissions_autoselecting_manageBundle_implied();
+ redrawRequired = true;
+ }
}
} else {
this.selectedPermissions.remove(permission);
@@ -499,14 +516,14 @@ public class PermissionsEditor extends EnhancedVStack {
}
}
- private ListGridRecord createPermissionRecord(String displayName, String icon,
Permission globalPermission,
+ private ListGridRecord createPermissionRecord(String displayName, String icon,
Permission permission,
String description) {
ListGridRecord record = new ListGridRecord();
record.setAttribute("displayName", displayName);
record.setAttribute("icon", icon);
- record.setAttribute("name", globalPermission.name());
+ record.setAttribute("name", permission.name());
record.setAttribute("description", description);
- record.setAttribute("authorized",
this.selectedPermissions.contains(globalPermission));
+ record.setAttribute("authorized",
this.selectedPermissions.contains(permission));
return record;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
index 63b6e3f..9c2dc96 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
@@ -268,7 +268,7 @@ public class RoleEditView extends
AbstractRecordEditor<RolesDataSource> implemen
onItemChanged();
}
});
- updateTab(this.resourceGroupsTab, this.resourceGroupSelector);
+ updateTab(this.bundleGroupsTab, this.bundleGroupSelector);
}
@@ -393,6 +393,9 @@ public class RoleEditView extends
AbstractRecordEditor<RolesDataSource> implemen
if (this.ldapGroupSelector != null) {
this.ldapGroupSelector.reset();
}
+ if (this.bundleGroupSelector != null) {
+ this.bundleGroupSelector.reset();
+ }
}
private static void updateTab(Tab tab, Canvas content) {
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 1f9c73c..25f5171 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -503,8 +503,10 @@ view_adminRoles_ldapGroupsReadOnly = LDAP group data is read only
view_adminRoles_noLdap = The LDAP security integration is not configured. To configure
LDAP, go to <a {0}>{1}</a>.
view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected
CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it...
view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected
CONFIGURE_READ permission, since CONFIGURE_WRITE implies it...
+view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected unselected
permissions, since MANAGE_BUNDLE implies all other bundle permissions...
view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected
unselected Resource permissions, since MANAGE_INVENTORY implies all Resource
permissions...
view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected
unselected permissions, since MANAGE_SECURITY implies all other permissions...
+view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions
view_adminRoles_permissions_globalPermissions = Global Permissions
view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0}
read permission cannot be deselected, unless the {0} write permission, which implies the
read permission, is deselected first.
view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0}
permission cannot be deselected, unless Manage Inventory, which implies all Resource
permissions, is deselected first.
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
index 4e73829..8982a54 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
@@ -522,12 +522,14 @@ view_adminRoles_ldapGroupsReadOnly = data LDAP skupiny jsou jen pro
čtení
view_adminRoles_noLdap = Integrace LDAP není nakonfigurována. K nastavení řízení
bezpečnosti přes LDAP prosím navštivte <a {0}>{1}</a>.
view_adminRoles_permissions_autoselecting_configureRead_implied = Automaticky odoznačeno
CONFIGURE_WRITE povolení, protože absence CONFIGURE_READ to implikuje...
view_adminRoles_permissions_autoselecting_configureWrite_implied = Automaticky označeno
CONFIGURE_READ povolení, protože CONFIGURE_WRITE jej implikuje...
+##view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected
unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions...
view_adminRoles_permissions_autoselecting_manageInventory_implied = Automaticky označeny
neoznačené zdroje, protože MANAGE_INVENTORY implikuje povolení na všech zdrojích...
view_adminRoles_permissions_autoselecting_manageSecurity_implied = Automaticky označeny
neoznačená povolení, protože MANAGE_SECURITY implikuje povolení na všech práv...
+view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions
view_adminRoles_permissions_globalPermissions = Globální povolení
-view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0}
read permission cannot be deselected, unless the {0} write permission, which implies the
read permission, is deselected first.
-view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0}
permission cannot be deselected, unless Manage Inventory, which implies all Resource
permissions, is deselected first.
-view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0}
permission cannot be deselected, unless the Manage Security permission, which implies all
other permissions, is deselected first.
+##view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection =
{0} read permission cannot be deselected, unless the {0} write permission, which implies
the read permission, is deselected first.
+##view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0}
permission cannot be deselected, unless Manage Inventory, which implies all Resource
permissions, is deselected first.
+##view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0}
permission cannot be deselected, unless the Manage Security permission, which implies all
other permissions, is deselected first.
view_adminRoles_permissions_isAuthorized = Autorizován?
view_adminRoles_permissions_isRead = Čtení?
view_adminRoles_permissions_isWrite = Zápis?
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 0db1d05..8b086a7 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -499,7 +499,16 @@ view_adminRoles_globalPerms = Applikationsweite Rechte
view_adminRoles_ldapGroups = LDAP-Gruppen
view_adminRoles_ldapGroupsReadOnly = LDAP Gruppendaten können nur gelesen werden
view_adminRoles_noLdap = Die LDAP-Integration ist nicht konfiguriert. Um LDAP zu
konfigurieren, wechseln sie zu <a {0}>{1}</a>.
+##view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected
CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it...
+##view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected
CONFIGURE_READ permission, since CONFIGURE_WRITE implies it...
+##view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected
unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions...
+##view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected
unselected Resource permissions, since MANAGE_INVENTORY implies all Resource
permissions...
+##view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected
unselected permissions, since MANAGE_SECURITY implies all other permissions...
+view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions
view_adminRoles_permissions_globalPermissions = Globale Rechte
+##view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection =
{0} read permission cannot be deselected, unless the {0} write permission, which implies
the read permission, is deselected first.
+##view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0}
permission cannot be deselected, unless Manage Inventory, which implies all Resource
permissions, is deselected first.
+##view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0}
permission cannot be deselected, unless the Manage Security permission, which implies all
other permissions, is deselected first.
view_adminRoles_permissions_isAuthorized = Berechtigt?
view_adminRoles_permissions_isRead = Lesen?
view_adminRoles_permissions_isWrite = Schreiben?
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index 626243e..a78ab58 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -500,8 +500,10 @@ view_adminRoles_ldapGroupsReadOnly = LDAPグループデータは読み出し専
view_adminRoles_noLdap = LDAPセキュリティの統合は構成されていません。LDAPを構成するには、 <a
{0}>{1}</a>に行ってください。
view_adminRoles_permissions_autoselecting_configureRead_implied =
CONFIGURE_WRITE権限が自動的に選択されました。なぜなら、CONFIGURE_READが無いことがそれを暗示しているからです。
view_adminRoles_permissions_autoselecting_configureWrite_implied =
CONFIGURE_READ権限が自動的に選択されました。なぜなら、CONFIGURE_WRITEがそれを暗示しているからです。
+##view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected
unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions...
view_adminRoles_permissions_autoselecting_manageInventory_implied =
未選択のリソース権限が自動的に選択されました。なぜなら、MANAGE_INVENTORYはすべてのリソース権限を暗示しているからです。
view_adminRoles_permissions_autoselecting_manageSecurity_implied =
未選択の権限が自動的に選択されました。なぜなら、MANAGE_SECURITYは他のすべての権限を暗示しているからです。
+view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions
view_adminRoles_permissions_globalPermissions = グローバル権限
view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0}
読み取り権限は選択解除できませんでした。読み取り権限を暗示する {0} 書き込み権限が最初に選択解除されなければそれはできません。
view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0}
権限は選択解除できませんでした。他のすべてのリソースを暗示する管理インベントリが最初に選択解除されなければそれはできません。
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
index 0da2a6e..a00f560 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
@@ -447,12 +447,21 @@ view_adminRoles_failLdapGroupsRole = 역할을 위해 사용가능한 LDAP 그
view_adminRoles_failRoles = 역할 제거에 실패했습니다.
view_adminRoles_globalPerms = 글로벌 권한
view_adminRoles_ldapGroups = LDAP 그룹
+##view_adminRoles_ldapGroupsReadOnly = LDAP group data is read only
view_adminRoles_noLdap = LDAP 보안 통합이 설정되지 않았습니다. LDAP을 구성하려면 <a {0}>{1}</a>로
가십시요.
+##view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected
CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it...
+##view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected
CONFIGURE_READ permission, since CONFIGURE_WRITE implies it...
+##view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected
unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions...
+##view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected
unselected Resource permissions, since MANAGE_INVENTORY implies all Resource
permissions...
+##view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected
unselected permissions, since MANAGE_SECURITY implies all other permissions...
+view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions
view_adminRoles_permissions_globalPermissions = 글로벌 권한
view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0}
읽기 권한은 선택 해제 할 수 없습니다. 읽기 권한을 암시하는 {0} 쓰기 권한이 먼저 선택 해제되어야 그것은 수행할 수 있습니다.
view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} 권한은 선택
해제 할 수 없습니다. 다른 모든 자원을 암시하는 관리 인벤토리가 먼저 선택 해제되어야 그것은 수행할 수 있습니다.
view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} 권한은 선택
해제 할 수 없습니다. 다른 모든 권한을 암시하는 관리 보안 권한이 먼저 선택 해제되어야 그것은 수행할 수 있습니다.
view_adminRoles_permissions_isAuthorized = 권한이 있습니까?
+##view_adminRoles_permissions_isRead = Read?
+##view_adminRoles_permissions_isWrite = Write?
##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle
to the bundle group
##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s.
can copy existing bundles between viewable groups
##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle
[version]s for the bundle group. can copy a viewable bundle to the bundle group.
@@ -470,16 +479,22 @@ view_adminRoles_permissions_permDesc_manageSettings = {0} 서버의 수정 및
##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the
group
view_adminRoles_permissions_permDesc_viewUsers = 다른 사용자를 볼 수 있습니다. 그러나 그들에게 할당된 역할은 보이지
않습니다.
view_adminRoles_permissions_permReadDesc_configure = 자원 설정 및 자원 설정 수정 기록 보기
+##view_adminRoles_permissions_permReadDesc_control = (IMPLIED) view available operations
and operation execution history
view_adminRoles_permissions_permReadDesc_createChildResources = (암시적) 자식 리소스 만들기 기록 보기
view_adminRoles_permissions_permReadDesc_deleteChildResources = (암시적) 자식 리소스 삭제 기록 보기
+##view_adminRoles_permissions_permReadDesc_inventory = (IMPLIED) view Resource properties
(name, description, version, etc.), connection settings, and connection settings history
view_adminRoles_permissions_permReadDesc_manageAlerts = (암시적) 경고 정의 및 경고 기록 보기
view_adminRoles_permissions_permReadDesc_manageContent = (암시적) 설치되어 사용가능한 패키지; 패키지 설치 기록
보기
view_adminRoles_permissions_permReadDesc_manageDrift = (암시적) 드리프트 정의와 드리프트 기록 보기
view_adminRoles_permissions_permReadDesc_manageEvents = (암시적) 이벤트 보기
view_adminRoles_permissions_permReadDesc_manageMeasurements = (암시적) 통계 데이터 및 수집 스케쥴 보기
+##view_adminRoles_permissions_permWriteDesc_configure = update Resource configuration;
delete Resource configuration revision history items
+##view_adminRoles_permissions_permWriteDesc_control = execute operations; delete
operation execution history items
view_adminRoles_permissions_permWriteDesc_createChildResources = (작성 가능한 유형의 자식 리소스에 대한)
새로운 자식 리소스 만들기
view_adminRoles_permissions_permWriteDesc_deleteChildResources = 자원 제거 인벤토리; (삭제 가능한 유형의
자원에 대한) 리소스 삭제
+##view_adminRoles_permissions_permWriteDesc_inventory = update Resource name, version,
description, and connection settings; delete connection settings history items
view_adminRoles_permissions_permWriteDesc_manageAlerts = 경고 정의를 만들기, 수정, 삭제; 경고 기록 확인 및
삭제
+##view_adminRoles_permissions_permWriteDesc_manageContent = subscribe to content sources;
install and uninstall packages
view_adminRoles_permissions_permWriteDesc_manageDrift = 드리프트 정의 만들기, 수정, 삭제; 드리프트 인스턴스
관리
view_adminRoles_permissions_permWriteDesc_manageEvents = 이벤트 삭제
view_adminRoles_permissions_permWriteDesc_manageMeasurements = 통계 수집 스케쥴 수정
@@ -517,6 +532,8 @@ view_adminRoles_resourcePerms = 리소스 권한
view_adminRoles_roleAdded = 역할 [{0}]이 추가되었습니다.
view_adminRoles_roleDeleteFailed = 역할 [{0}]의 삭제에 실패했습니다.
view_adminRoles_roleDeleted = 역할 [{0}]이 삭제되었습니다.
+##view_adminRoles_roleUpdateFailed = Failed to update role [{0}].
+##view_adminRoles_roleUpdated = Role [{0}] updated.
view_adminTemplates_definedBy = 정의
view_adminTemplates_platformServices = 플랫폼 서비스
view_adminTemplates_platforms = 플랫폼
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
index 6d74d41..e6a7864 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
@@ -505,8 +505,10 @@ view_adminRoles_ldapGroupsReadOnly = Informa\u00E7\u00F5es do grupo
LDAP com per
view_adminRoles_noLdap = A integra\u00E7\u00E3o com o LDAP ainda n\u00E3o foi
configurada. Para configurar o LDAP acesse <a {0}>{1}</a>.
view_adminRoles_permissions_autoselecting_configureRead_implied = Permiss\u00E3o
CONFIGURE_WRITE desmarcada automaticamente devida a aus\u00EAncia da permiss\u00E3o
CONFIGURE_READ...
view_adminRoles_permissions_autoselecting_configureWrite_implied = Permiss\u00E3o
CONFIGURE_READ marcada automaticamente devida a marca\u00E7\u00E3o de CONFIGURE_WRITE...
+##view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected
unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions...
view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected
unselected Resource permissions, since MANAGE_INVENTORY implies all Resource
permissions...
view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected
unselected permissions, since MANAGE_SECURITY implies all other permissions...
+view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions
view_adminRoles_permissions_globalPermissions = Permiss\u00F5es Globais
view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0}
permiss\u00E3o de leitura n\u00E3 pode ser desmarcada, a menos que {0} permiss\u00E3o de
escrita, que implica na permiss\u00E3o de leitura, seja desmarcada primeiro.
view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0}
permiss\u00E3o n\u00E3o pode ser desmarcada, a menos que Gerenciar Invent\u00E1rio, que
implica todas as permiss\u00F5es de Recurso, seja desmarcada primeiro.
@@ -584,7 +586,6 @@ view_adminRoles_resourcePerms = Permiss\u00F5es do Recurso
view_adminRoles_roleAdded = Perfil [{0}] adicionado.
view_adminRoles_roleDeleteFailed = Falha ao excluir o perfil [{0}].
view_adminRoles_roleDeleted = Perfil [{0}] exclu\u00EDdo.
-view_adminRoles_roleExists = O perfil com nome [{0}] j\u00E1 existe.
view_adminRoles_roleUpdateFailed = Falha ao atualizar o perfil [{0}].
view_adminRoles_roleUpdated = Perfil [{0}] atualizado.
##view_adminTemplates_definedBy = Defined By
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
index f31b829..4f9a97e 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
@@ -2574,6 +2574,7 @@ view_adminConfig_systemSettings = Системные настройки
view_adminContent_contentSources = Источники контента
view_adminRoles_assignedGroups = Назначенные группы ресурсов
view_adminRoles_assignedSubjects = Назначенные субъекты
+##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing
name [{0}]. Please use another name.
view_adminRoles_failLdap = Не удалось определить, настроен ли LDAP - предположительно
LDAP отсутствует.
view_adminRoles_failLdapGroups = Не удалось получить LDAP-группы. Предположительно LDAP
группы отсутствуют
view_adminRoles_failLdapGroupsRole = Не удалось загрузить LDAP группы, доступные для
роли.
@@ -2581,10 +2582,13 @@ view_adminRoles_failRoles = Не удалось получить роли.
view_adminRoles_globalPerms = Глобальные полномочия
view_adminRoles_ldapGroups = LDAP-группы
view_adminRoles_ldapGroupsReadOnly = данные LDAP групп доступны только для чтения
+##view_adminRoles_noLdap = The LDAP security integration is not configured. To configure
LDAP, go to <a {0}>{1}</a>.
view_adminRoles_permissions_autoselecting_configureRead_implied = Автоматически отключено
CONFIGURE_WRITE полномочие, поскольку отсутствует CONFIGURE_READ...
view_adminRoles_permissions_autoselecting_configureWrite_implied = Автоматически выбрано
CONFIGURE_READ полномочие, поскольку CONFIGURE_WRITE подразумевает, что ...
+##view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected
unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions...
view_adminRoles_permissions_autoselecting_manageInventory_implied = Автоматически
установлены не выбранные полномочия реусурсов, поскольку MANAGE_INVENTORY предполагает все
полномочия ресурса...
view_adminRoles_permissions_autoselecting_manageSecurity_implied = Автоматически
установлены невыбранные полномочия, поскольку MANAGE_SECURITY включает все другие
полномочия...
+view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions
view_adminRoles_permissions_globalPermissions = Глобальные полномчия
view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0}
полномочия на чтение не могут быть отключены, пока предварительно {0} полномочия записи,
которые включают полномочия на чтение, не будут отключены.
view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0}
полномочия не могут быть отключены, пока предварительно Manage Inventory, которая включает
все полномочия ресурса, не будет отключено.
@@ -2609,17 +2613,23 @@ view_adminRoles_permissions_permDesc_manageSecurity = можно
создава
##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the
group
##view_adminRoles_permissions_permDesc_viewUsers = can view other users, with the
exception of their assigned roles
view_adminRoles_permissions_permReadDesc_configure = просмотр конфигурации ресурса и
историю версий конфигурации ресурса
+##view_adminRoles_permissions_permReadDesc_control = (IMPLIED) view available operations
and operation execution history
view_adminRoles_permissions_permReadDesc_createChildResources = (ПОДРАЗУМЕВАЕМЫЙ)
просмотр истории создания дочернего ресурса
view_adminRoles_permissions_permReadDesc_deleteChildResources = (ПОДРАЗУМЕВАЕМЫЙ)
просмотр истории удаления дочернего ресурса
view_adminRoles_permissions_permReadDesc_inventory = (ПОДРАЗУМЕВАЕМЫЙ) просмотр свойств
ресурса (наименование, описание, версия и т.д.), настройки подключения, и историю настроек
подключения
view_adminRoles_permissions_permReadDesc_manageAlerts = (ПОДРАЗУМЕВАЕМЫЙ) просмотр
определений предупреждений и истории предупреждения
+##view_adminRoles_permissions_permReadDesc_manageContent = (IMPLIED) view installed and
available packages; view package installation history
+##view_adminRoles_permissions_permReadDesc_manageDrift = (IMPLIED) view drift definitions
and drift history
view_adminRoles_permissions_permReadDesc_manageEvents = (ПОДРАЗУМЕВАЕМЫЙ) просмотр
событий
+##view_adminRoles_permissions_permReadDesc_manageMeasurements = (IMPLIED) view metric
data and collection schedules
view_adminRoles_permissions_permWriteDesc_configure = обновить конфигурацию ресурса;
удалить элементы истории версий конфигурации ресурса
view_adminRoles_permissions_permWriteDesc_control = выполнять операции; удалить элементы
истории выполнения операций
+##view_adminRoles_permissions_permWriteDesc_createChildResources = create new child
Resources (for child Resources of types that are creatable)
view_adminRoles_permissions_permWriteDesc_deleteChildResources = убрать ресурс из
инвентаризации; удалить ресурсы (для типов ресурсов, которые могут быть удалены)
view_adminRoles_permissions_permWriteDesc_inventory = обновить наименование ресурса,
версию, описание и настройки подключения; удалить элементы истории настроек подключения
view_adminRoles_permissions_permWriteDesc_manageAlerts = создать, обновить и удалить
определения уведомлений; подтверждать и удалять элементы истории предупреждений
view_adminRoles_permissions_permWriteDesc_manageContent = подписаться на источники
контента; устанавливать и удалять пакеты
+##view_adminRoles_permissions_permWriteDesc_manageDrift = create, update, and delete
drift definitions; and manage drift instances
view_adminRoles_permissions_permWriteDesc_manageEvents = удалять события
view_adminRoles_permissions_permWriteDesc_manageMeasurements = обновление метрик
коллекции планировщиков
##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
index 1aeb1a1..547ebd5 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
@@ -492,14 +492,16 @@ view_adminRoles_globalPerms = \u5168\u5c40\u6388\u6743
view_adminRoles_ldapGroups = LDAP\u7ec4
view_adminRoles_ldapGroupsReadOnly = LDAP\u7ec4\u6570\u636e\u4e3a\u53ea\u8bfb
view_adminRoles_noLdap = \u6ca1\u6709\u96c6\u6210LDAP\u5b89\u5168, \u5230<a
{0}>{1}</a>.
-view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected
CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it...
-view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected
CONFIGURE_READ permission, since CONFIGURE_WRITE implies it...
-view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected
unselected Resource permissions, since MANAGE_INVENTORY implies all Resource
permissions...
-view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected
unselected permissions, since MANAGE_SECURITY implies all other permissions...
+##view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected
CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it...
+##view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected
CONFIGURE_READ permission, since CONFIGURE_WRITE implies it...
+##view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected
unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions...
+##view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected
unselected Resource permissions, since MANAGE_INVENTORY implies all Resource
permissions...
+##view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected
unselected permissions, since MANAGE_SECURITY implies all other permissions...
+view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions
view_adminRoles_permissions_globalPermissions = \u5168\u5c40\u6388\u6743
-view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0}
read permission cannot be deselected, unless the {0} write permission, which implies the
read permission, is deselected first.
-view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0}
permission cannot be deselected, unless Manage Inventory, which implies all Resource
permissions, is deselected first.
-view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0}
permission cannot be deselected, unless the Manage Security permission, which implies all
other permissions, is deselected first.
+##view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection =
{0} read permission cannot be deselected, unless the {0} write permission, which implies
the read permission, is deselected first.
+##view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0}
permission cannot be deselected, unless Manage Inventory, which implies all Resource
permissions, is deselected first.
+##view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0}
permission cannot be deselected, unless the Manage Security permission, which implies all
other permissions, is deselected first.
view_adminRoles_permissions_isAuthorized = \u6388\u6743?
view_adminRoles_permissions_isRead = \u8bfb?
view_adminRoles_permissions_isWrite = \u5199?
@@ -523,16 +525,16 @@ view_adminRoles_permissions_permReadDesc_configure =
\u67e5\u770b\u8d44\u6e90\u9
view_adminRoles_permissions_permReadDesc_control = (IMPLIED)
\u67e5\u770b\u53ef\u7528\u64cd\u4f5c\u548c\u64cd\u4f5c\u6267\u884c\u5386\u53f2
view_adminRoles_permissions_permReadDesc_createChildResources = (IMPLIED)
\u67e5\u770b\u5b50\u8d44\u6e90\u521b\u5efa\u5386\u53f2
view_adminRoles_permissions_permReadDesc_deleteChildResources = (IMPLIED)
\u67e5\u770b\u5b50\u8d44\u6e90\u5220\u9664\u5386\u53f2
-view_adminRoles_permissions_permReadDesc_inventory = (IMPLIED) view Resource properties
(name, description, version, etc.), connection settings, and connection settings history
+##view_adminRoles_permissions_permReadDesc_inventory = (IMPLIED) view Resource properties
(name, description, version, etc.), connection settings, and connection settings history
view_adminRoles_permissions_permReadDesc_manageAlerts = (IMPLIED)
\u67e5\u770b\u544a\u8b66\u5b9a\u4e49\u548c\u544a\u8b66\u5386\u53f2
view_adminRoles_permissions_permReadDesc_manageContent = (IMPLIED)
\u67e5\u770b\u5b89\u88c5\u7684\u548c\u53ef\u7528\u7684\u5305;
\u67e5\u770b\u5305\u5b89\u88c5\u5386\u53f2
##view_adminRoles_permissions_permReadDesc_manageDrift = (IMPLIED) view drift definitions
and drift history
view_adminRoles_permissions_permReadDesc_manageEvents =
(IMPLIED)\u67e5\u770b\u4e8b\u4ef6
-view_adminRoles_permissions_permReadDesc_manageMeasurements = (IMPLIED) view metric data
and collection schedules
+##view_adminRoles_permissions_permReadDesc_manageMeasurements = (IMPLIED) view metric
data and collection schedules
view_adminRoles_permissions_permWriteDesc_configure =
\u66f4\u65b0\u8d44\u6e90\u914d\u7f6e;
\u5220\u9664\u8d44\u6e90\u914d\u7f6e\u4fee\u8ba2\u7684\u5386\u53f2\u9879
view_adminRoles_permissions_permWriteDesc_control = \u6267\u884c\u64cd\u4f5c;
\u5220\u9664\u64cd\u4f5c\u6267\u884c\u5386\u53f2
view_adminRoles_permissions_permWriteDesc_createChildResources =
\u521b\u5efa\u65b0\u7684\u5b50\u8d44\u6e90 (for child Resources of types that are
creatable)
-view_adminRoles_permissions_permWriteDesc_deleteChildResources = uninventory resources;
delete Resources (for Resources of types that are deletable)
+##view_adminRoles_permissions_permWriteDesc_deleteChildResources = uninventory resources;
delete Resources (for Resources of types that are deletable)
view_adminRoles_permissions_permWriteDesc_inventory = \u66f4\u65b0\u8d44\u6e90\u540d,
\u7248\u672c,\u63cf\u8ff0, \u548c\u8fde\u63a5\u8bbe\u7f6e;
\u5220\u9664\u8fde\u63a5\u8bbe\u7f6e\u5386\u53f2\u9879
view_adminRoles_permissions_permWriteDesc_manageAlerts = \u521b\u5efa, \u66f4\u65b0,
\u548c\u5220\u9664\u544a\u8b66\u5b9a\u4e49;
\u786e\u8ba4\u548c\u5220\u9664\u5386\u53f2\u544a\u8b66\u9879
view_adminRoles_permissions_permWriteDesc_manageContent = \u8ba2\u9605\u5185\u5bb9\u6e90;
\u5b89\u88c5\u5378\u8f7d\u5305