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

Fixed and closed #467: names of new items are now trimmed before saving or renaming.

Browse source
This commit is contained in:
Dario Solera 2010-01-27 11:24:32 +00:00
parent 121f90fd9b
commit f8e410bf6a
12 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
WebApplication/FileManager.ascx.cs
View file

@ -461,6 +461,9 @@ namespace ScrewTurn.Wiki {
protected void btnRename_Click(object sender, EventArgs e) {
lblRenameResult.Text = "";
bool done = false;
txtNewName.Text = txtNewName.Text.Trim();
if(lblItem.Text.EndsWith("/")) {
if(canDeleteDirs) {
MovePermissions(CurrentDirectory + lblItem.Text, CurrentDirectory + txtNewName.Text);
@ -487,6 +490,8 @@ namespace ScrewTurn.Wiki {
txtNewName.Text += previousExtension;
}
txtNewName.Text = txtNewName.Text.Trim();
done = true;
if(txtNewName.Text.ToLowerInvariant() != lblItem.Text.ToLowerInvariant()) {
done = provider.RenameFile(CurrentDirectory + lblItem.Text, CurrentDirectory + txtNewName.Text);
@ -519,6 +524,8 @@ namespace ScrewTurn.Wiki {
protected void btnNewDirectory_Click(object sender, EventArgs e) {
if(canCreateDirs) {
txtNewDirectoryName.Text = txtNewDirectoryName.Text.Trim();
lblNewDirectoryResult.Text = "";
txtNewDirectoryName.Text = txtNewDirectoryName.Text.Trim('/');
AuthWriter.ClearEntriesForDirectory(provider, CurrentDirectory + txtNewDirectoryName.Text + "/");