Merge pull request #664 from johnhenley/dev81/1-refactoring/4-remove-…

…security-table-662/1-rename-api-param-662 TASK: Rename API parameter
DNNCommunity · Feb 21, 2024 · f3038bd · f3038bd
2 parents 56fdfa5 + f018e6c
commit f3038bd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Dnn.CommunityForums/Services/AdminServiceController.cs b/Dnn.CommunityForums/Services/AdminServiceController.cs
@@ -142,7 +142,7 @@ public class ToggleSecurityDTO
             public int PermissionsId { get; set; }
             public string SecurityId { get; set; }
             public int SecurityType { get; set; }
-            public string SecurityKey { get; set; }
+            public string SecurityAccessRequested { get; set; }
             public string ReturnId { get; set; }
         }
 
@@ -182,13 +182,13 @@ public HttpResponseMessage ToggleSecurity(ToggleSecurityDTO dto)
                     }
                 default:
                     {
-                        var permSet = db.GetPermSet(dto.PermissionsId, dto.SecurityKey);
+                        var permSet = db.GetPermSet(dto.PermissionsId, dto.SecurityAccessRequested);
                         if (dto.Action == "remove")
                             permSet = Permissions.RemovePermFromSet(dto.SecurityId, dto.SecurityType, permSet);
                         else
                             permSet = Permissions.AddPermToSet(dto.SecurityId, dto.SecurityType, permSet);
 
-                        db.SavePermSet(dto.PermissionsId, dto.SecurityKey, permSet);
+                        db.SavePermSet(dto.PermissionsId, dto.SecurityAccessRequested, permSet);
                         return Request.CreateResponse(HttpStatusCode.OK, dto.Action + "|" + dto.ReturnId);
                     }
             }

diff --git a/Dnn.CommunityForums/components/Data/Common.cs b/Dnn.CommunityForums/components/Data/Common.cs
@@ -38,16 +38,16 @@ public IDataReader GetRoles(int PortalId)
 		{
 			return SqlHelper.ExecuteReader(_connectionString, dbPrefix + "Permissions_GetRoles", PortalId);
 		}
-		public string GetPermSet(int PermissionsId, string Key)
+		public string GetPermSet(int PermissionsId, string requestedAccess)
 		{
-			string sSQL = "SELECT IsNULL(Can" + Key + ",'||||') from " + dbPrefix + "Permissions WHERE PermissionsId = " + PermissionsId;
+			string sSQL = "SELECT IsNULL(Can" + requestedAccess + ",'||||') from " + dbPrefix + "Permissions WHERE PermissionsId = " + PermissionsId;
 			return Convert.ToString(SqlHelper.ExecuteScalar(_connectionString, CommandType.Text, sSQL));
 		}
-		public string SavePermSet(int PermissionsId, string Key, string PermSet)
+		public string SavePermSet(int PermissionsId, string requestedAccess, string PermSet)
 		{
-			string sSQL = "UPDATE " + dbPrefix + "Permissions SET Can" + Key + " = '" + PermSet + "' WHERE PermissionsId = " + PermissionsId;
+			string sSQL = "UPDATE " + dbPrefix + "Permissions SET Can" + requestedAccess + " = '" + PermSet + "' WHERE PermissionsId = " + PermissionsId;
 			SqlHelper.ExecuteNonQuery(_connectionString, CommandType.Text, sSQL);
-			return GetPermSet(PermissionsId, Key);
+			return GetPermSet(PermissionsId, requestedAccess);
 		}
 		public int CreatePermSet(string AdminRoleId)
 		{

diff --git a/Dnn.CommunityForums/controls/admin_securitygrid.ascx b/Dnn.CommunityForums/controls/admin_securitygrid.ascx
@@ -64,14 +64,14 @@ function secGridComplete(){
     af_clearLoad();
 };
 
-function securityCallback(action, returnId, pid, secId,secName, secType, key, callback) {
+function securityCallback(action, returnId, pid, secId,secName, secType, accessReq, callback) {
     var data = {};
     data.ModuleId = <%=ModuleId%>;
     data.Action = action;
     data.PermissionsId = pid;
     data.SecurityId = secId;
     data.SecurityType = secType;
-    data.SecurityKey = key;
+    data.SecurityAccessRequested = accessReq;
     data.ReturnId = returnId;
     var sf = $.ServicesFramework(<%=ModuleId%>);
     //sf.getAntiForgeryProperty(data);