file_share 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/app/views/file_attachments/_file_attachments.html.erb

@@ -1,18 +1,26 @@
 <div id="file_attachments">
+  <% if orphans.present? && files.present? %>
   <div id="orphans" class="span-8">
-    <h2>Orphaned Files (<em><%= @orphans.count %></em>)</h2>
-    <%= render :partial => 'file_attachments/file_attachment', :collection => @orphans %>
+    <h2>Orphaned Files</h2>
+    <%= render :partial => 'file_attachments/file_attachment', :collection => orphans %>
   </div>
   <div id="files" class="span-8 last">
-    <h2>Files (<em><%= @files.count %></em>)</h2>
-    <% @files.group_by(&:attachable).each do |attachable, attached_files| %>
+    <h2>Attached Files</h2>
+    <% files.group_by(&:attachable).each do |attachable, attached_files| %>
     <div id="<%= "#{attachable.class}_#{attachable.id}" %>">
-    <h3><%= link_to attachable.name, polymorphic_path(attachable) %> (<em><%= attached_files.count %></em>)</h3>
+    <h3><%= link_to attachable.name, polymorphic_path(attachable) %></h3>
     <%= render :partial => 'file_attachments/file_attachment', :collection => attached_files %>
     </div>
     <% end %>
   </div>
   <div style="clear:both;"></div>
+  <% else %>
+  <div id="files">
+    <% if files.present? || orphans.present? %>
+    <%= render :partial => 'file_attachments/file_attachment', :collection => files.present? ? files : orphans %>
+    <% end %>
+  </div>
+  <% end %>
 </div>
 
 <% if has_authorization?(:update, FileAttachment.new) %>

data/app/views/file_attachments/_plupload_with_listing.html.erb

@@ -1,3 +1,5 @@
+<% orphans ||= [] %>
+<% files ||= [] %>
 <% content_for(:javascript) do %>
   <script type="text/javascript">
   jQuery.ajaxSetup({
@@ -7,11 +9,16 @@
   });
   function bindCallbacks(plupload) {
     plupload.bind('FileUploaded', function(up, file, response) {
-      if( $('#file_container_select').val() ) {
-        $("#" + $('#file_container_select').val() ).append(response.response);
-      } else {
-        $("#orphans").append(response.response);
+      var element_selector = '';
+      if( $('#file_container_select').val() &&
+        $("#"+$('#file_container_select').val())[0] ) {
+          element_selector = "#" + $('#file_container_select').val();
+      } else if( $("#orphans")[0] ) {
+        element_selector = "#orphans"
+      } else if( $("#files")[0] ) {
+        element_selector = "#files"
       }
+      $(element_selector).append(response.response);
   	});
   	plupload.bind('UploadProgress', function() {
       if( plupload.files.length == plupload.total.failed + plupload.total.uploaded ) {
@@ -79,9 +86,12 @@
   
 <% end %>
 
-<h3>Downloadable Resources<hr /></h3>
+<h2>Downloadable Resources</h2>
 
-<%= render :partial => 'file_attachments/file_attachments' %>
+<%= render :partial => 'file_attachments/file_attachments', :locals => {
+  :orphans => orphans,
+  :files => files
+} %>
 
 <% if has_authorization?(:create, FileAttachment.new) %>
 

data/app/views/file_attachments/index.html.erb

@@ -1 +1,4 @@
-<%= render :partial => 'file_attachments/plupload_with_listing', :locals => {:file_attachments => @file_attachments} %>
+<%= render :partial => 'file_attachments/plupload_with_listing', :locals => {
+  :orphans => @orphans,
+  :files => @files
+} %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: file_share
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jason LaPier