File manager fixes submitted by Joep [Lighthouse ticket 72]

cykod · Aug 11, 2010 · a5feaf0 · a5feaf0
1 parent ffb4ff5
commit a5feaf0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/app/controllers/file_controller.rb b/app/controllers/file_controller.rb
@@ -299,7 +299,7 @@ def create_folder
 
       gallery_folder = Configuration.options.gallery_folder.to_i == parent_folder.id
 
-      @folder = parent_folder.children.create(:name => name,:file_type => 'fld',:special => gallery_folder ? 'gallery' : '')
+      @folder = parent_folder.children.create(:creator_id => myself.id, :name => name,:file_type => 'fld',:special => gallery_folder ? 'gallery' : '')
       @parent_id = parent_folder.id
       if gallery_folder
         @folder.create_gallery(:name => name, :occurred_at => Time.now)

diff --git a/app/views/file/_file_javascript.rhtml b/app/views/file/_file_javascript.rhtml
@@ -526,7 +526,10 @@ FileEditor = {
 
 	selectTreeNode: function(folder_id) {
 		FileEditor.gotoFolder(folder_id);
-
+	  if(folder_id && folder_id != 1)
+      FileEditor.selectedItems = [ folder_id ];
+    else
+      FileEditor.selectedItems = [];
 	},
 
 	highlightTreeFolder:function(folder_id) {

diff --git a/app/views/file/_file_tree.rhtml b/app/views/file/_file_tree.rhtml
@@ -23,11 +23,11 @@
 <% if fld.parent_id.nil? %>
 <span class="mod_node" >
 	<%= theme_image_tag 'icons/domain.gif', :class => "node_handle_icon", :id => "node_handle_#{fld.id}" , :onclick => "FileEditor.selectTreeNode(#{fld.id});" %>
-    <%= "Domain Root".t %>
+  <a href='javascript:void(0);' class='node_title'  id='node_title_<%= fld.id %>' onclick="FileEditor.selectTreeNode(<%= fld.id %>);"><%= "Domain Root".t %></a>
 </span>
 <% else -%>
 	<%= image_tag theme_src(fld.mini_icon), :class => "node_handle_icon", :id => "node_handle_#{fld.id}" , :onclick => "FileEditor.selectTreeNode(#{fld.id});" %>
-    <a href='javascript:void(0);' class='node_title'  id='node_title_<%= fld.id %>' onclick="FileEditor.selectTreeNode(<%= fld.id %>);"><%= fld.name %></a>
+  <a href='javascript:void(0);' class='node_title'  id='node_title_<%= fld.id %>' onclick="FileEditor.selectTreeNode(<%= fld.id %>);"><%= fld.name %></a>
 <% end -%>
 
 <span class='node_title_edit' id='node_title_edit_<%= fld.id %>' style='display:none;'></span>

diff --git a/app/views/file/details/_folder_details.rhtml b/app/views/file/details/_folder_details.rhtml
@@ -6,8 +6,10 @@
   <% if file.file_type_match(@select) -%>
     <button onclick='FileEditor.callbackFile(<%= file.id %>);'>Select</button>
   <% end -%>
-  <button onclick='FileEditor.folderArchive(<%= file.id %>);'>Create Archive</button> 
- <button class='last' onclick='FileEditor.deleteSelected([<%= file.id  %>]);'>Delete</button>  
+  <% 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>
 

diff --git a/app/views/file/load_folder.rjs b/app/views/file/load_folder.rjs
@@ -6,7 +6,7 @@ page.replace_html 'folder_title', :partial =>  'folder_title', :locals => { :fol
 if @file 
 
   if @file.folder?
-    page.replace_html :file_manager_body, :partial => '/file/details/folder_details', :locals => {:file => @file }
+    page.replace_html :file_manager_body, :partial => '/file/details/folder_details', :locals => {:file => @file, :folder_just_loaded => true }
   else
     page.replace_html :file_manager_body, :partial => '/file/details/file_details', :locals => {:file => @file }
   end