file_share 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/app/controllers/file_attachments_controller.rb

@@ -3,8 +3,6 @@ class FileAttachmentsController < FileShare::ApplicationController
   # before_filter :load_and_authorize_current_user, :except => [:index, :show, :download]
   
   rescue_from Errno::ENOENT, :with => :file_not_found
-  
-  helper_method :has_authorization?
 
   private
     def file_not_found(e)
@@ -31,10 +29,6 @@ class FileAttachmentsController < FileShare::ApplicationController
       #end
       #session[:return_to] = nil
     end
-    def has_authorization?(*args)
-      # stub
-      true
-    end
     def load_containers
       @file_containers = FileContainer.all
     end

data/app/controllers/file_share/application_controller.rb

@@ -1,5 +1,11 @@
 class FileShare::ApplicationController < ApplicationController
+  helper_method :has_authorization?
+
   private
+    # Redefine this method to implement authorization
+    def has_authorization?(*args)
+      true
+    end
   protected
   public
 end

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

@@ -1,5 +1,9 @@
 <%= div_for(file_attachment) do %>
-  <span id="file_attachment_<%= file_attachment.id %>_file_container" class="file_attachment_file_container" style="display:none;"><%= file_attachment.file_container %></span>
+  <%= content_tag :span, file_attachment.file_container, {
+    :id => "file_attachment_#{file_attachment.id}_file_container",
+    :class => "file_attachment_file_container",
+    :style => "display:none;"
+  } if has_authorization?(:update, file_attachment) %>
   <%= description_display(file_attachment) %>
   <%= name_display(file_attachment) %>
   <%= content_tag :p, :style => "font-size: 11px;" do %>

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

@@ -24,7 +24,6 @@
 </div>
 
 <% if has_authorization?(:update, FileAttachment.new) %>
-<!-- <div id="blank_description_form" style="display: none; padding: 5px 0;"> -->
 <form id="file_attachment_dynamic_form" class="formtastic" method="post" action="<%= file_attachments_path %>" style="display: none; padding: 5px 0;">
   <div style="margin: 0pt; padding: 0pt; display: inline;">
     <input type="hidden" value="put" name="_method" />
@@ -45,7 +44,6 @@
   <br />
   <input type="submit" value="Update" /> | <a href="#" class="cancel_dynamic_form">Cancel</a>
 </form>
-<!-- </div> -->
 
 <% content_for(:javascript) do %>
 <script type="text/javascript">

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

@@ -19,4 +19,4 @@
   <% end %>
 
   <%= f.buttons %>
-<% end %>
+<% end if has_authorization?(:create, FileAttachment.new) %>

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

@@ -1,17 +1,7 @@
-<% 
-#if @file_attachment.event_id.nil?
-%>
-<p><%= link_to '< back', file_attachments_path, :class => 'fake_button' %></p>
-<%
-#else
-%>
-<!-- <p><%= 
-#link_to '< back', event_path(@file_attachment.event.id), :class => 'fake_button'
-%>
-</p> -->
-<% 
-#end
-%>
+<%- back_path = @file_attachment.attachable_id.blank? ? 
+  file_attachments_path : polymorphic_path(@file_attachment.attachable_id) -%>
+<p><%= link_to '< back', back_path, :class => 'fake_button' %></p>
+
 <%= content_tag :div do %>
   <%= semantic_form_for @file_attachment do |form| %>
     <%= form.inputs do %>
@@ -22,13 +12,8 @@
           :selected => "#{@file_attachment.attachable_type}_#{@file_attachment.attachable_id}"
         }
       }) %>
-      <%= 
-      #form.input :event, :hint => 'does this file belong somewhere else?'
-      %>
       <%= form.input :description, :hint => "of file contents, purpose, etc" %>
     <% end %>
-    <%= form.buttons do %>
-      <%= form.commit_button%>
-    <% end %>
+    <%= form.buttons %>
   <% end %>
-<% end %>
+<% end if has_authorization?(:update, @file_attachment) %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: file_share
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jason LaPier