From 772c08f6a8ce4d4fb674c28989bc231e085fc9e4 Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Sun, 26 May 2013 14:55:18 -0400
Subject: [PATCH] delete route param name change, put the filename in
 upload/delete success messages

---
 src/blarg/routes/files.clj                | 6 +++---
 src/blarg/views/templates/files/list.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/blarg/routes/files.clj b/src/blarg/routes/files.clj
index 9d36fdc..a2ebaa7 100644
--- a/src/blarg/routes/files.clj
+++ b/src/blarg/routes/files.clj
@@ -34,7 +34,7 @@
                            (files/update-file id tempfile content-type)
                            (files/add-file path filename tempfile content-type))]
         (do
-          (session/flash-put! :file-success "File uploaded successfully.")
+          (session/flash-put! :file-success (str "<strong>" (:id savedfile) "</strong> was uploaded successfully."))
           (session/flash-put! :file-notice "Existing file with the same name was updated with the uploaded file."))
         (session/flash-put! :file-error "File could not be uploaded.")))
     (session/flash-put! :file-error "No file selected to upload."))
@@ -42,7 +42,7 @@
 
 (defn handle-delete-file [file]
   (if-let [deleted (files/delete-file file)]
-    (session/flash-put! :file-success "File was deleted successfully.")
+    (session/flash-put! :file-success (str "<strong>" file "</strong> was deleted successfully."))
     (session/flash-put! :file-error "File could not be deleted."))
   (resp/redirect "/listfiles"))
 
@@ -55,5 +55,5 @@
   (restricted GET "/listfiles" [] (list-files "/"))
   (restricted GET "/listfiles/*" [*] (list-files *))
   (restricted POST "/uploadfile" [path file] (handle-new-file (ensure-prefix-suffix path "/") file))
-  (restricted POST "/deletefile" [file] (handle-delete-file (ensure-prefix file "/")))
+  (restricted POST "/deletefile" [id] (handle-delete-file (ensure-prefix id "/")))
   (GET "/files/*" [*] (get-file *)))
diff --git a/src/blarg/views/templates/files/list.html b/src/blarg/views/templates/files/list.html
index a4edf02..7c94dd9 100644
--- a/src/blarg/views/templates/files/list.html
+++ b/src/blarg/views/templates/files/list.html
@@ -93,7 +93,7 @@
 		<h3 id="deleteFileModalLabel">Delete File</h3>
 	</div>
 	<form action="{{context}}/deletefile" method="post" class="form-horizontal">
-		<input type="hidden" id="deleteFileId" name="file" />
+		<input type="hidden" id="deleteFileId" name="id" />
 		<div class="modal-body">
 			<p>Confirm that you would like to delete the following file:</p>
 			<p><strong id="deleteFileModalFilename"></strong></p>