Merge pull request #5299 from sbwalker/dev

fix #5398 - editing page permissions

Oqtane.Client/Modules/Admin/Pages/Edit.razor

@@ -217,6 +217,9 @@
                         </div>
                     </Section>
                     <br />
+                    <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+                    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+                    <br />
                     <br />
                     <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo>
                 </TabPanel>
@@ -225,6 +228,19 @@
                         <div class="row mb-1 align-items-center">
                             <PermissionGrid EntityName="@EntityNames.Page" PermissionList="@_permissions" @ref="_permissionGrid" />
                         </div>
+                        <br /><br />
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="updatemodulepermissions" HelpText="Specify if changes made to page permissions should be propagated to the modules on this page" ResourceKey="UpdateModulePermissions">Update Module Permissions? </Label>
+                            <div class="col-sm-9">
+                                <select id="updatemodulepermissions" class="form-select" @bind="@_updatemodulepermissions" required>
+                                    <option value="True">@SharedLocalizer["Yes"]</option>
+                                    <option value="False">@SharedLocalizer["No"]</option>
+                                </select>
+                            </div>
+                        </div>
+                        <br />
+                        <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
                     </div>
                 </TabPanel>
                 <TabPanel Name="PageModules" Heading="Modules" ResourceKey="PageModules">
@@ -247,8 +263,10 @@
                 {
                     <TabPanel Name="ThemeSettings" Heading="Theme Settings" ResourceKey="ThemeSettings">
                         @_themeSettingsComponent
-                    </TabPanel>
                         <br />
+                        <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+                    </TabPanel>
                 }
             </TabStrip>
         }
@@ -299,19 +317,21 @@
                             </div>
                         </div>
                     </div>
+                    <br />
+                    <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+                    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
                 </TabPanel>
                 @if (_themeSettingsType != null)
                 {
                     <TabPanel Name="ThemeSettings" Heading="Theme Settings" ResourceKey="ThemeSettings">
                         @_themeSettingsComponent
-                    </TabPanel>
-                    <br />
-                }
-            </TabStrip>
-        }
                         <br />
                         <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
                         <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+                    </TabPanel>
+                }
+            </TabStrip>
+        }
     </form>
 }
 
@@ -348,6 +368,7 @@
     private string _bodycontent;
     private List<Permission> _permissions = null;
     private PermissionGrid _permissionGrid;
+    private string _updatemodulepermissions;
     private List<Module> _pageModules;
     private string _createdby;
     private DateTime _createdon;
@@ -436,6 +457,7 @@
 
                 // permissions
                 _permissions = _page.PermissionList;
+                _updatemodulepermissions = "True";
 
                 // page modules
                 var modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
@@ -651,6 +673,7 @@
                     if (_page.UserId == null)
                     {
                         _page.PermissionList = _permissionGrid.GetPermissionList();
+                        _page.UpdateModulePermissions = bool.Parse(_updatemodulepermissions);
                     }
 
                     _page = await PageService.UpdatePageAsync(_page);

Oqtane.Client/Modules/Admin/Users/Edit.razor

@@ -141,7 +141,7 @@
             </div>
         </TabPanel>
     </TabStrip>
-
+    <br />
     <button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
     @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin) && PageState.Runtime != Shared.Runtime.Hybrid && !_ishost)

Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx

@@ -303,4 +303,10 @@
   <data name="PersonalizedUrlPath.HelpText" xml:space="preserve">
     <value>Provide a url path for your personalized page. Please note that spaces and punctuation will be replaced by a dash.</value>
   </data>
+  <data name="UpdateModulePermissions.Text" xml:space="preserve">
+    <value>Update Module Permissions?</value>
+  </data>
+  <data name="UpdateModulePermissions.HelpText" xml:space="preserve">
+    <value>Specify if changes made to page permissions should be propagated to the modules on this page</value>
+  </data>
 </root>

Oqtane.Server/Controllers/PageController.cs

@@ -295,9 +295,13 @@ namespace Oqtane.Controllers
                 var removed = GetPermissionsDifferences(currentPermissions, page.PermissionList);
 
                 // synchronize module permissions
-                if (added.Count > 0 || removed.Count > 0)
+                if (page.UpdateModulePermissions && (added.Count > 0 || removed.Count > 0))
                 {
-                    foreach (PageModule pageModule in _pageModules.GetPageModules(page.SiteId).Where(item => item.PageId == page.PageId).ToList())
+                    var pageModules = _pageModules.GetPageModules(page.SiteId);
+                    foreach (PageModule pageModule in pageModules.Where(item => item.PageId == page.PageId).ToList())
+                    {
+                        // ignore "shared" modules
+                        if (!pageModules.Any(item => item.ModuleId == pageModule.ModuleId && item.PageId != pageModule.PageId))
                         {
                             var modulePermissions = _permissionRepository.GetPermissions(pageModule.Module.SiteId, EntityNames.Module, pageModule.Module.ModuleId).ToList();
                             // permissions added
@@ -331,6 +335,7 @@ namespace Oqtane.Controllers
                             }
                         }
                     }
+                }
 
                 // update child paths
                 if (page.ParentId != currentPage.ParentId)

Oqtane.Shared/Models/Page.cs

@@ -122,6 +122,12 @@ namespace Oqtane.Models
         [NotMapped]
         public bool HasChildren { get; set; }
 
+        /// <summary>
+        /// Indicates if module permissions should be updated to be consistent with page permissions
+        /// </summary>
+        [NotMapped]
+        public bool UpdateModulePermissions { get; set; }
+
         /// <summary>
         /// List of permissions for this page
         /// </summary>