gered/blarg
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

delete route param name change, put the filename in upload/delete success messages

Browse source
This commit is contained in:
Gered 2013-05-26 14:55:18 -04:00
parent 6b1627196c
commit 772c08f6a8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/blarg/routes/files.clj
View file

@ -34,7 +34,7 @@
(files/update-file id tempfile content-type) (files/update-file id tempfile content-type)
(files/add-file path filename tempfile content-type))] (files/add-file path filename tempfile content-type))]
(do (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-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 "File could not be uploaded.")))
(session/flash-put! :file-error "No file selected to upload.")) (session/flash-put! :file-error "No file selected to upload."))
@ -42,7 +42,7 @@
(defn handle-delete-file [file] (defn handle-delete-file [file]
(if-let [deleted (files/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.")) (session/flash-put! :file-error "File could not be deleted."))
(resp/redirect "/listfiles")) (resp/redirect "/listfiles"))
@ -55,5 +55,5 @@
(restricted GET "/listfiles" [] (list-files "/")) (restricted GET "/listfiles" [] (list-files "/"))
(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 "/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 *))) (GET "/files/*" [*] (get-file *)))

2
src/blarg/views/templates/files/list.html
View file

@ -93,7 +93,7 @@
<h3 id="deleteFileModalLabel">Delete File</h3> <h3 id="deleteFileModalLabel">Delete File</h3>
</div> </div>
<form action="{{context}}/deletefile" method="post" class="form-horizontal"> <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"> <div class="modal-body">
<p>Confirm that you would like to delete the following file:</p> <p>Confirm that you would like to delete the following file:</p>
<p><strong id="deleteFileModalFilename"></strong></p> <p><strong id="deleteFileModalFilename"></strong></p>