disallow editing scores, remove bad route for Profile

talklittle · Nov 18, 2010 · 6ac1373 · 6ac1373
1 parent 684cae7
commit 6ac1373
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 22 deletions.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -40,6 +40,9 @@ def edit
   # POST /users
   # POST /users.xml
   def create
+    params[:user][:tester_score] = 0
+    params[:user][:evaluator_score] = 0
+    params[:user][:requester_score] = 0
     @user = User.new(params[:user])
 
     if @user.save

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
@@ -3,11 +3,15 @@
     <ul class="navigation round">
         <li><%= link_to "Home", root_path %></li>
         <li><%= link_to "Tasks", tasks_path %></li>
-        <li><%= link_to "Profile", profile_path %></li>
         <% if signed_in? %>
-            <li><%= link_to "Logout", logout_path, :method => :delete %></li>
+        <li><%= link_to "Profile", edit_user_path(current_user) %></li>
+        <% end %>
+        <li><%= link_to "About", about_path %></li>
+        <li><%= link_to "Contact Us", contact_path %></li>
+        <% if signed_in? %>
+        <li><%= link_to "Logout", logout_path, :method => :delete %></li>
         <% else %>
-            <li><%= link_to "Login", login_path %></li>
+        <li><%= link_to "Login", login_path %></li>
         <% end %>
     </ul>
 </div>

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
@@ -11,18 +11,22 @@
     <%= f.label :password %><br />
     <%= f.text_field :password %>
   </p>
+
   <p>
-    <%= f.label :tester_score %><br />
-    <%= f.text_field :tester_score %>
+    <b>Tester score:</b><br />
+    <%= @user.tester_score %>
   </p>
+
   <p>
-    <%= f.label :evaluator_score %><br />
-    <%= f.text_field :evaluator_score %>
+    <b>Evaluator score:</b><br />
+    <%= @user.evaluator_score %>
   </p>
+
   <p>
-    <%= f.label :requester_score %><br />
-    <%= f.text_field :requester_score %>
+    <b>Requester score:</b><br />
+    <%= @user.requester_score %>
   </p>
+
   <p>
     <%= f.submit 'Update' %>
   </p>

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
@@ -11,18 +11,6 @@
     <%= f.label :password %><br />
     <%= f.password_field :password %>
   </p>
-  <p>
-    <%= f.label :tester_score %><br />
-    <%= f.text_field :tester_score %>
-  </p>
-  <p>
-    <%= f.label :evaluator_score %><br />
-    <%= f.text_field :evaluator_score %>
-  </p>
-  <p>
-    <%= f.label :requester_score %><br />
-    <%= f.text_field :requester_score %>
-  </p>
   <p>
     <%= f.submit 'Create' %>
   </p>

diff --git a/config/routes.rb b/config/routes.rb
@@ -40,7 +40,6 @@
   #     admin.resources :products
   #   end
   map.register  '/register',  :controller => 'users',    :action => 'new'
-  map.profile   '/profile',   :controller => 'users',    :action => 'edit'
   map.tasks     '/tasks',     :controller => 'tasks',    :action => 'index'
   map.about     '/about',     :controller => 'pages',    :action => 'about'
   map.contact   '/contact',   :controller => 'pages',    :action => 'contact'