File managers fixes - fix delete folder from sidebar and after create

cykod · Aug 11, 2010 · d79d84a · d79d84a
1 parent 208a825
commit d79d84a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/app/views/file/_create_folder.rjs b/app/views/file/_create_folder.rjs
@@ -6,5 +6,5 @@ page << 'FileEditor.showDetails();'
 
 page << "setTimeout('FileEditor.refreshUploadedFolder(#{@folder.id},#{@parent_id})',10);"
 page << "FileEditor.recreateDragAndDroppables();"
-
+page << "FileEditor.highlightTreeFolder(#{@folder.id});"
 page << "setTimeout('FileEditor.nameChange(#{@folder.id});',20); "
diff --git a/app/views/file/_file_javascript.rhtml b/app/views/file/_file_javascript.rhtml
@@ -703,9 +703,9 @@ FileEditor = {
 
 
 
-  	deleteSelected: function() {
+  	deleteSelected: function(file_ids) {
   	  if(confirm('<%= jh "Are you sure you want to delete the selected item(s)?" %>')) {
-  	      var itms = FileEditor.selectedItems;
+  	      var itms = file_ids ? file_ids : FileEditor.selectedItems;
   	      var req = $H({ 'file_id[]' : itms });
 		      new Ajax.Request('<%= url_for :controller => "file", :action => "delete_files" %>',
 					      {  parameters : req.toQueryString()  + FileEditor.sizeParameters(),

diff --git a/app/views/file/details/_folder_details.rhtml b/app/views/file/details/_folder_details.rhtml
@@ -6,10 +6,8 @@
   <% if file.file_type_match(@select) -%>
     <button onclick='FileEditor.callbackFile(<%= file.id %>);'>Select</button>
   <% end -%>
-  <% if !defined?(folder_just_loaded) || folder_just_loaded != true -%>
     <button onclick='FileEditor.folderArchive(<%= file.id %>);'>Create Archive</button> 
     <button class='last' onclick='FileEditor.deleteSelected([<%= file.id  %>]);'>Delete</button>  
-  <% end -%>
   <div style='clear:both;'></div>
 </div>