zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed permission check for Meta-Files editing.

Browse source
This commit is contained in:
Matteo Tomasini 2011-06-06 15:24:25 +02:00
parent 86354487c9
commit 17d01657a7
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AssemblyVersion.cs
View file

@ -16,5 +16,5 @@ using System.Reflection;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("3.0.4.572")] [assembly: AssemblyVersion("3.0.4.573")]
[assembly: AssemblyFileVersion("3.0.4.572")] [assembly: AssemblyFileVersion("3.0.4.573")]

13
WebApplication/Admin.master.cs
View file

@ -94,7 +94,7 @@ namespace ScrewTurn.Wiki {
lnkSelectConfig.Visible = CanManageConfiguration(currentUser, currentGroups); lnkSelectConfig.Visible = CanManageConfiguration(currentUser, currentGroups);
// Content (can manage config) // Content (can manage config)
lnkSelectContent.Visible = CanManageConfiguration(currentUser, currentGroups); lnkSelectContent.Visible = CanManageMetaFiles(currentUser, currentGroups);
// Groups (can manage groups) // Groups (can manage groups)
lnkSelectGroups.Visible = CanManageGroups(currentUser, currentGroups); lnkSelectGroups.Visible = CanManageGroups(currentUser, currentGroups);
@ -135,6 +135,17 @@ namespace ScrewTurn.Wiki {
return canManageConfiguration; return canManageConfiguration;
} }
/// <summary>
/// Determines whether a user can manage the Meta-Files (Content).
/// </summary>
/// <param name="username">The username.</param>
/// <param name="groups">The groups.</param>
/// <returns><c>true</c> if the user can manage the Meta-Files (Content), <c>false</c> otherwise.</returns>
public static bool CanManageMetaFiles(string username, string[] groups) {
bool canManageMetaFiles = AuthChecker.CheckActionForGlobals(Actions.ForGlobals.ManageMetaFiles, username, groups);
return canManageMetaFiles;
}
/// <summary> /// <summary>
/// Determines whether a user can manage categories in at least one namespace. /// Determines whether a user can manage categories in at least one namespace.
/// </summary> /// </summary>

2
WebApplication/AdminContent.aspx.cs
View file

@ -13,7 +13,7 @@ namespace ScrewTurn.Wiki {
protected void Page_Load(object sender, EventArgs e) { protected void Page_Load(object sender, EventArgs e) {
AdminMaster.RedirectToLoginIfNeeded(); AdminMaster.RedirectToLoginIfNeeded();
if(!AdminMaster.CanManageConfiguration(SessionFacade.GetCurrentUsername(), SessionFacade.GetCurrentGroupNames())) UrlTools.Redirect("AccessDenied.aspx"); if(!AdminMaster.CanManageMetaFiles(SessionFacade.GetCurrentUsername(), SessionFacade.GetCurrentGroupNames())) UrlTools.Redirect("AccessDenied.aspx");
if(!Page.IsPostBack) { if(!Page.IsPostBack) {
// Load namespaces // Load namespaces