diff --git a/dotCMS/src/main/webapp/WEB-INF/messages/Language.properties b/dotCMS/src/main/webapp/WEB-INF/messages/Language.properties
index 0d6cc6fbbec9..c9f51ddec8ce 100644
--- a/dotCMS/src/main/webapp/WEB-INF/messages/Language.properties
+++ b/dotCMS/src/main/webapp/WEB-INF/messages/Language.properties
@@ -117,6 +117,7 @@ add-tag = Add Tag
Add-Template = Add Template
add-template = Add Template
Add-To-Bundle = Add To Bundle
+Add-To-Bundle-all-users = Add all Users to Bundle
Add-to-List = Add to List
Add-User = Add User
add-variable = Add Variable
@@ -3359,6 +3360,7 @@ Remote-Address = Remote Address
remote-host-ip = Remote Site/IP
Remote-Publish-Bundle = Push Publish Bundle
Remote-Publish = Push Publish
+Remote-Publish-all-users = Push Publish all Users
remote-syncronization-title = Push Publish Categories
Remote-Syncronization = Push Publish
remove-address-confirmation = Are you sure you want to remove this Address? (This operation cannot be undone)
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/useradmin/view_users.jsp b/dotCMS/src/main/webapp/html/portlet/ext/useradmin/view_users.jsp
index fce61dfa23ee..e679a4deca53 100644
--- a/dotCMS/src/main/webapp/html/portlet/ext/useradmin/view_users.jsp
+++ b/dotCMS/src/main/webapp/html/portlet/ext/useradmin/view_users.jsp
@@ -124,12 +124,12 @@
<% if ( enterprise ) {%>
<% if ( endPoints ) {%>
-
- <%= LanguageUtil.get(pageContext, "Remote-Publish") %>
+
+ <%= LanguageUtil.get(pageContext, "Remote-Publish-all-users") %>
<%}%>
-
- <%= LanguageUtil.get(pageContext, "Add-To-Bundle") %>
+
+ <%= LanguageUtil.get(pageContext, "Add-To-Bundle-all-users")%>
<%}%>
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/useradmin/view_users_js_inc.jsp b/dotCMS/src/main/webapp/html/portlet/ext/useradmin/view_users_js_inc.jsp
index faeef6256a58..9decd59a049a 100644
--- a/dotCMS/src/main/webapp/html/portlet/ext/useradmin/view_users_js_inc.jsp
+++ b/dotCMS/src/main/webapp/html/portlet/ext/useradmin/view_users_js_inc.jsp
@@ -216,7 +216,11 @@
};
var remotePublishUsers = function () {
- pushHandler.showDialog( "users_", true );
+ if (window.selectedUser) {
+ pushHandler.showDialog( "user_" + window.selectedUser, true );
+ }else{
+ pushHandler.showDialog( "users_", true );
+ }
};
var addToBundleUser = function () {
@@ -226,7 +230,13 @@
};
var addToBundleUsers = function () {
- pushHandler.showAddToBundleDialog("users_", '<%=LanguageUtil.get(pageContext, "Add-To-Bundle")%>', true);
+
+ if (window.selectedUser) {
+ pushHandler.showAddToBundleDialog("user_" + window.selectedUser, '<%=LanguageUtil.get(pageContext, "Add-To-Bundle")%>', true);
+ }else{
+ pushHandler.showAddToBundleDialog("users_", '<%=LanguageUtil.get(pageContext, "Add-To-Bundle")%>', true);
+ }
+
};
var filterUsersHandler;
@@ -293,6 +303,10 @@
if(userChanged && currentUser && userId != currentUser.id &&
!confirm(abondonUserChangesConfirm))
return;
+
+ document.getElementById('remotePublishUsersDiv_text').innerHTML = '<%=LanguageUtil.get(pageContext, "Remote-Publish")%>';
+ document.getElementById('addToBundleUsersDiv_text').innerHTML = '<%=LanguageUtil.get(pageContext, "Add-To-Bundle")%>';
+
dojo.byId('userProfileTabs').style.display = 'none';
dojo.byId('loadingUserProfile').style.display = '';
dojo.byId('gravatarTextHolder').display='none';