Changeset 80568

Timestamp:

07/14/11 22:49:56 (4 years ago)

Author:

derek@…

Message:

Add user model, update os_statistics model and views to reflect replacement of uuid column with user_id

• Added model/user.rb for Users table
• os_statistic.rb: changed uuid to user_id - added belong_to user relationship
• index.html.erb view updated to show user_id instead of uuid
• show.html.erb no longer displays uuid

Location:

branches/gsoc11-statistics/stats-server/app

Files:

• models/os_statistic.rb (modified) (2 diffs)
• models/user.rb (added)
• views/os_statistics/index.html.erb (modified) (2 diffs)
• views/os_statistics/show.html.erb (modified) (1 diff)

branches/gsoc11-statistics/stats-server/app/models/os_statistic.rb

@@ -1 +1 @@
 class OsStatistic < ActiveRecord::Base
-  attr_accessible :uuid 
+  belongs_to :user
+  
+  attr_accessible :user_id
   attr_accessible :macports_version
   attr_accessible :osx_version
@@ -9 +11 @@
   attr_accessible :xcode_version
   
-  validates :uuid,              :presence => true
+  validates :user_id,           :presence => true
   validates :macports_version,  :presence => true
   validates :osx_version,       :presence => true

branches/gsoc11-statistics/stats-server/app/views/os_statistics/index.html.erb

@@ -121 +121 @@
         <tr>
                 <th> ID </th>
-                <th> UUID </th>
+                <th> user_id </th>
                 <th> MacPorts Version</th>
                 <th> OSX Version</th>
@@ -135 +135 @@
   <tr>
     <td> <%= row.id %> </td>
-                <td> <%= row.uuid %> </td>
+                <td> <%= row.user_id %> </td>
                 <td> <%= row.macports_version %> </td>
                 <td> <%= row.osx_version %></td>

branches/gsoc11-statistics/stats-server/app/views/os_statistics/show.html.erb

@@ -1 @@
-<p>UUID: <%= @os_stats.uuid %></p>
-
 <p> macports_version: <%= @os_stats.macports_version %> </p>
 <p> osx_version:      <%= @os_stats.osx_version %></p>