summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavisLWebb <davislwebb@ymail.com>2014-04-23 20:32:58 -0400
committerDavisLWebb <davislwebb@ymail.com>2014-04-23 20:32:58 -0400
commita729106e956e051818bb2d37f1581f3bf3abcefd (patch)
tree443f6ca40f3ff02f3368253675a7d81ec0b3ab02
parent8423f93a586c4278ea25d3b10bb731e732be0ba9 (diff)
Fixed several user controller errors
-rw-r--r--app/controllers/users_controller.rb2
-rw-r--r--app/views/users/show.html.erb8
2 files changed, 9 insertions, 1 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 68c0743..cfa5d67 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -39,7 +39,7 @@ class UsersController < ApplicationController
respond_to do |format|
if @user.save
sign_in @user
- if @user.id == daft punk1
+ if @user.id == 1
# This is the first user, so give them all the power
@user.permissions = 0xFFFFFFFF
@user.save
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index b85cbda..81eee6f 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -20,6 +20,14 @@
too single
</p>
+<p>
+ <%= label :username %><br>
+ <%= text_field %>
+
+ <br><input type="submit" value="Submit"><br>
+
+</p>
+
<div class="row">
<div class="col-md-6">
<h3> Recent Tournaments Played </h3>