variable users renamed to usersForMentions

web/documentserver-example/csharp-mvc/Models/FileModel.cs

@@ -366,13 +366,13 @@ namespace OnlineEditorsExampleMVC.Models
             dataMailMergeRecipients = jss.Serialize(mailMergeConfig);
         }
 
-        //get a users mentions
-        public void GetUsersMentions(HttpRequest request, out string users)
+        //get a users for mentions
+        public void GetUsersMentions(HttpRequest request, out string usersForMentions)
         {
             var jss = new JavaScriptSerializer();
             var id = request.Cookies.GetOrDefault("uid", null);
             var user = Users.getUser(id);
-            users = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForMentions(user.id)) : jss.Serialize(null);
+            usersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForMentions(user.id)) : jss.Serialize(null);
         }
     }
 }

web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx

@@ -136,10 +136,10 @@
         };
 
         var onRequestUsers = function () {
-            <% string users; %>
-            <% Model.GetUsersMentions(Request, out users); %>
+            <% string usersForMentions; %>
+            <% Model.GetUsersMentions(Request, out usersForMentions); %>
             docEditor.setUsers({
-                "users": <%= users%>
+                "users": <%= usersForMentions%>
             });
         };
 

web/documentserver-example/csharp/DocEditor.aspx

@@ -149,7 +149,7 @@
 
         var onRequestUsers = function () {
             docEditor.setUsers({
-                "users": <%= users%>
+                "users": <%= usersForMentions%>
             });
         }
 

web/documentserver-example/csharp/DocEditor.aspx.cs

@@ -66,7 +66,7 @@ namespace OnlineEditorsExample
         protected string InsertImageConfig { get; private set; }
         protected string compareFileData { get; private set; }
         protected string dataMailMergeRecipients { get; private set; }
-        protected string users { get; private set; }
+        protected string usersForMentions { get; private set; }
         protected string documentType { get { return _Default.DocumentType(FileName); } }
 
         // get callback url
@@ -272,7 +272,7 @@ namespace OnlineEditorsExample
 
                 // get users for mentions
                 List<Dictionary<string, object>> usersData = Users.getUsersForMentions(user.id);
-                users = !user.id.Equals("uid-0") ? jss.Serialize(usersData) : jss.Serialize(null);
+                usersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(usersData) : jss.Serialize(null);
 
                 Dictionary<string, object> hist;
                 Dictionary<string, object> histData;

web/documentserver-example/java/src/main/java/controllers/EditorServlet.java

@@ -90,7 +90,7 @@ public class EditorServlet extends HttpServlet
         dataMailMergeRecipients.put("url", DocumentManager.GetServerUrl(true) + "/IndexServlet?type=csv");
 
         // users data for mentions
-        List<Map<String, Object>> usersData = !user.id.equals("uid-0") ? Users.getUsersForMentions(user.id) : null;
+        List<Map<String, Object>> usersForMentions = !user.id.equals("uid-0") ? Users.getUsersForMentions(user.id) : null;
 
         // check if the document token is enabled
         if (DocumentManager.TokenEnabled())
@@ -107,7 +107,7 @@ public class EditorServlet extends HttpServlet
         request.setAttribute("dataInsertImage",  gson.toJson(dataInsertImage).substring(1, gson.toJson(dataInsertImage).length()-1));
         request.setAttribute("dataCompareFile",  gson.toJson(dataCompareFile));
         request.setAttribute("dataMailMergeRecipients", gson.toJson(dataMailMergeRecipients));
-        request.setAttribute("users", gson.toJson(usersData));
+        request.setAttribute("usersForMentions", gson.toJson(usersForMentions));
         request.getRequestDispatcher("editor.jsp").forward(request, response);
     }
 

web/documentserver-example/java/src/main/webapp/editor.jsp

@@ -121,7 +121,7 @@
 
         var onRequestUsers = function () {
             docEditor.setUsers({
-                "users": ${users}
+                "users": ${usersForMentions}
             });
         };
 

web/documentserver-example/php/doceditor.php

@@ -137,7 +137,7 @@
     ];
     
     // users data for mentions
-    $users = $user->id != "uid-0" ? getUsersForMentions($user->id) : null;
+    $usersForMentions = $user->id != "uid-0" ? getUsersForMentions($user->id) : null;
 
     // check if the secret key to generate token exists
     if (isJwtEnabled()) {
@@ -398,7 +398,7 @@
 
         var onRequestUsers = function () {
             docEditor.setUsers({
-                "users": <?php echo json_encode($users) ?>
+                "users": <?php echo json_encode($usersForMentions) ?>
             });
         };
 

web/documentserver-example/python/src/views/actions.py

@@ -223,7 +223,7 @@ def edit(request):
     }
 
     # users data for mentions
-    usersData = users.getUsersForMentions(user.id) if user.id !='uid-0' else None
+    usersForMentions = users.getUsersForMentions(user.id) if user.id !='uid-0' else None
 
     if jwtManager.isEnabled():  # if the secret key to generate token exists
         edConfig['token'] = jwtManager.encode(edConfig)  # encode the edConfig object into a token
@@ -242,7 +242,7 @@ def edit(request):
         'dataInsertImage': json.dumps(dataInsertImage)[1 : len(json.dumps(dataInsertImage)) - 1],  # the image which will be inserted into the document
         'dataCompareFile': dataCompareFile,  # document which will be compared with the current document
         'dataMailMergeRecipients': json.dumps(dataMailMergeRecipients),  # recipient data for mail merging
-        'users': json.dumps(usersData)
+        'usersForMentions': json.dumps(usersForMentions)
     }
     return render(request, 'editor.html', context)  # execute the "editor.html" template with context data
 

web/documentserver-example/python/templates/editor.html

@@ -136,7 +136,7 @@
 
         var onRequestUsers = function () {
             docEditor.setUsers({
-                "users": {{ users | safe }}
+                "users": {{ usersForMentions | safe }}
             });
         };