specs ok

fireho · May 3, 2009 · a33a9a9 · a33a9a9
1 parent 6e8b299
commit a33a9a9
Show file tree

Hide file tree

Showing 48 changed files with 224 additions and 698 deletions.
diff --git a/app/models/message.rb b/app/models/message.rb
@@ -19,8 +19,8 @@
 #
 #
 class Message < ActiveRecord::Base
-  belongs_to :sender, :foreign_key => :from_id, :class_name => "user"
-  belongs_to :receiver, :foreign_key => :to_id, :class_name => "user"
+  belongs_to :sender, :foreign_key => :from_id, :class_name => "User"
+  belongs_to :receiver, :foreign_key => :to_id, :class_name => "User"
   belongs_to :parent, :foreign_key => :parent_id, :class_name => "Message"
 
   validates_presence_of :sender, :receiver

diff --git a/app/views/ads/_ad.html.haml b/app/views/ads/_ad.html.haml
@@ -0,0 +1,12 @@
+- semantic_form_for(@ad) do |f|
+  = f.input :title
+  = f.input :kind
+  = f.input :body
+  = f.input :start_at, :as => :string
+  = f.input :end_at, :as => :string
+  %p
+    = f.submit 'Update'
+
+= link_to 'Show', @ad
+|
+= link_to 'Back', ads_path
diff --git a/app/views/ads/edit.html.erb b/app/views/ads/edit.html.erb
diff --git a/app/views/ads/edit.html.haml b/app/views/ads/edit.html.haml
@@ -0,0 +1,3 @@
+%h1 Editing ad
+
+= render @ad
diff --git a/app/views/ads/index.html.erb b/app/views/ads/index.html.erb
diff --git a/app/views/ads/index.html.haml b/app/views/ads/index.html.haml
@@ -0,0 +1,35 @@
+%h1
+  Listing ads
+%table
+  %tr
+    %th
+      Title
+    %th
+      Kind
+    %th
+      Body
+    %th
+      Start at
+    %th
+      End at
+  - @ads.each do |ad|
+    %tr
+      %td
+        = h ad.title
+      %td
+        = h ad.kind
+      %td
+        = h ad.body
+      %td
+        = h ad.start_at
+      %td
+        = h ad.end_at
+      %td
+        = link_to 'Show', ad
+      %td
+        = link_to 'Edit', edit_ad_path(ad)
+      %td
+        = link_to 'Destroy', ad, :confirm => 'Are you sure?', :method => :delete
+
+%br
+= link_to 'New ad', new_ad_path
diff --git a/app/views/ads/new.html.erb b/app/views/ads/new.html.erb
diff --git a/app/views/ads/new.html.haml b/app/views/ads/new.html.haml
@@ -0,0 +1,3 @@
+%h1 New ad
+
+= render @ad
diff --git a/app/views/ads/show.html.erb b/app/views/ads/show.html.erb
diff --git a/app/views/ads/show.html.haml b/app/views/ads/show.html.haml
@@ -0,0 +1,23 @@
+%p
+  %b
+    Title:
+  = h @ad.title
+%p
+  %b
+    Kind:
+  = h @ad.kind
+%p
+  %b
+    Body:
+  = h @ad.body
+%p
+  %b
+    Start at:
+  = h @ad.start_at
+%p
+  %b
+    End at:
+  = h @ad.end_at
+= link_to 'Edit', edit_ad_path(@ad)
+|
+= link_to 'Back', ads_path
diff --git a/app/views/areas/show.html.haml b/app/views/areas/show.html.haml
@@ -1,18 +1,15 @@
-<p>
-  <b>Name:</b>
-  <%=h @area.name %>
-</p>
-
-<p>
-  <b>Kind:</b>
-  <%=h @area.kind %>
-</p>
-
-<p>
-  <b>Geom:</b>
-  <%=h @area.geom %>
-</p>
-
-
-<%= link_to 'Edit', edit_area_path(@area) %> |
-<%= link_to 'Back', areas_path %>
+%p
+  %b
+    Name:
+  = h @area.name
+%p
+  %b
+    Kind:
+  = h @area.kind
+%p
+  %b
+    Geom:
+  = h @area.geom
+= link_to 'Edit', edit_area_path(@area)
+|
+= link_to 'Back', areas_path
diff --git a/app/views/laws/edit.html.haml b/app/views/laws/edit.html.haml
@@ -2,4 +2,4 @@
   .head
     %h2.title Editando Lei
   .content
-    .inner= render @plaw
+    .inner= render @law
diff --git a/app/views/registers/edit.html.erb b/app/views/registers/edit.html.erb
diff --git a/app/views/registers/index.html.erb b/app/views/registers/index.html.erb
diff --git a/app/views/registers/new.html.erb b/app/views/registers/new.html.erb
diff --git a/app/views/registers/show.html.erb b/app/views/registers/show.html.erb