Merge branch 'master' of [email protected]:fireho/siga

* 'master' of [email protected]:fireho/siga:
  Attachment funcionando
  Alterações para os attachments

.gitignore

@@ -28,3 +28,4 @@ public/rubyrun_rss/*
 *.#*
 config/deploy.rb
 nbproject/*
+public/system

app/models/attachment.rb

@@ -19,9 +19,10 @@
 #
 #
 class Attachment < ActiveRecord::Base
+  belongs_to :attachable, :polymorphic => true
   has_attached_file :media,
-                    :styles => { :medium => "300x300>",
-                                 :thumb => "100x100>" }
+                    :styles => { :thumb => ["200x200#", :png] }
+  validates_attachment_presence :media
 
 end
 

app/views/attachments/_attachment.html.erb

@@ -0,0 +1,18 @@
+<% form_for(@attachment, :html => {:multipart => true}) do |f| %>
+  <%= f.error_messages %>
+
+  <p>
+    <%= f.label :media %><br />
+    <%= f.file_field :media %>
+  </p>
+  <p>
+    <%= f.label :info %><br />
+    <%= f.text_area :info %>
+  </p>
+  <p>
+    <%= f.submit 'Update' %>
+  </p>
+<% end %>
+
+<%= link_to 'Show', @attachment %> |
+<%= link_to 'Back', attachments_path %>

app/views/attachments/edit.html.erb

@@ -4,8 +4,8 @@
   <%= f.error_messages %>
 
   <p>
-    <%= f.label :attachable %><br />
-    <%= f.text_field :attachable %>
+    <%= f.label :media %><br />
+    <%= f.file_field :media %>
   </p>
   <p>
     <%= f.label :info %><br />

app/views/attachments/index.html.erb

@@ -8,7 +8,7 @@
 
 <% @attachments.each do |attachment| %>
   <tr>
-    <td><%=h attachment.attachable %></td>
+    <td><%=image_tag attachment.media.url(:thumb)%></td>
     <td><%=h attachment.info %></td>
     <td><%= link_to 'Show', attachment %></td>
     <td><%= link_to 'Edit', edit_attachment_path(attachment) %></td>

app/views/attachments/new.html.erb

@@ -1,19 +1,3 @@
 <h1>New attachment</h1>
 
-<% form_for(@attachment) do |f| %>
-  <%= f.error_messages %>
-
-  <p>
-    <%= f.label :attachable %><br />
-    <%= f.text_field :attachable %>
-  </p>
-  <p>
-    <%= f.label :info %><br />
-    <%= f.text_area :info %>
-  </p>
-  <p>
-    <%= f.submit 'Create' %>
-  </p>
-<% end %>
-
-<%= link_to 'Back', attachments_path %>
+<%=render @attachment%>

app/views/users/index.html.erb

@@ -1,7 +1,7 @@
 <fieldset>
 <legend>Usuários</legend>
 
-<% if session_user.adm == "SIM" %>
+<% if user_session.adm == "SIM" %>
   <% @menu = 'home/menuAdm' %>
 <% end %>
 
@@ -27,7 +27,7 @@
 
 <p align='right'>
   <%= tooltip link_to(image_tag('novo.png', :border => 0), :action => "new" ), { :tooltip => 'Adicionar novo registro.' } %>
-  <%= tooltip link_to(image_tag('voltar.png', :border => 0), :controller => "home", :action => "menuAdm" ), { :tooltip => 'Retornar.' } %>
+  <%#= tooltip link_to(image_tag('voltar.png', :border => 0), :controller => "home", :action => "menuAdm" ), { :tooltip => 'Retornar.' } %>
   </p>
 
 </fieldset>