Skip to content

Commit

Permalink
Added error message for empty email fields and fixed small bugs in us…
Browse files Browse the repository at this point in the history 
…er form verification.

Related to issue #19.
  • Loading branch information
Pekka Ekman committed Jun 7, 2011
1 parent a213bc4 commit 8d9198e
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 82 deletions.
8 changes: 4 additions & 4 deletions app/models/user.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ class User < ActiveRecord::Base
has_many :published, :class_name => "Product", :foreign_key => "publisher_id"
has_many :comments
attr_protected :is_admin, :receive_admin_email
validates :username, :password, :email, :presence => { :if => Proc.new { |user| user.asi_id.blank? } }
validates :username, :password, :presence => { :on => :create }
validates :terms, :acceptance => { :on => :create }
validates :password, :confirmation => { :if => Proc.new { |user| user.password.present? } }
# terms == the language of the accepted terms and conditions
validates :terms, :acceptance => true
validates :email, :presence => true
attr_accessor :terms, :no_asi_fetch

PERSON_HASH_CACHE_EXPIRE_TIME = 0#15 #ALSO THIS CACHE TEMPORARILY OFF TO TEST PERFORMANCE WIHTOUT IT
Expand All @@ -33,7 +33,7 @@ class User < ActiveRecord::Base
}

# attributes that cannot be unset
ASI_NONUNSETTABLE_ATTRIBUTES = Set.new [:password, :email, :gender]
ASI_NONUNSETTABLE_ATTRIBUTES = Set.new [:password, :gender]

def initialize(attr_values={})
_asi_id, self.asi_cookie, self.terms, self.password_confirmation, self.no_asi_fetch =
Expand Down
6 changes: 4 additions & 2 deletions app/views/users/_form.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<%= form_for @user do |f| %>
<% if flash[:error] || @user.errors.any? %>
<div id="error_explanation">
<h2><%= _("Validation errors prohibited this user from being saved") %>:</h2>
<h2><%= _("Validation errors prohibited user information from being saved") %>:</h2>

<ul>
<%
( (@user.errors[:terms] ? [_('In order to register, you must accept the OtaSizzle "Terms and Conditions".')] : []) +
( (@user.errors[:terms].present? ?
[_('In order to register, you must accept the OtaSizzle "Terms and Conditions".')] :
[] ) +
(flash[:error] || []) +
@user.errors.except(:terms).full_messages
).each do |msg|
Expand Down
79 changes: 41 additions & 38 deletions config/locales/gettext/aaltoapps.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: version 0.0.1\n"
"POT-Creation-Date: 2011-05-18 18:35+0300\n"
"POT-Creation-Date: 2011-06-07 16:20+0300\n"
"PO-Revision-Date: 2011-02-02 15:23+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -45,7 +45,7 @@ msgstr ""
msgid "Add Photo"
msgstr ""

#: app/views/products/_form.html.erb:99
#: app/views/products/_form.html.erb:100
msgid "Add a new download:"
msgstr ""

Expand All @@ -65,7 +65,7 @@ msgstr ""
msgid "Admin comments"
msgstr ""

#: app/views/layouts/application.html.erb:222
#: app/views/layouts/application.html.erb:260
msgid "All"
msgstr ""

Expand Down Expand Up @@ -103,11 +103,11 @@ msgstr ""
msgid "Block"
msgstr ""

#: app/views/layouts/application.html.erb:257
#: app/views/layouts/application.html.erb:295
msgid "Blocked products"
msgstr ""

#: app/views/products/_form.html.erb:132
#: app/views/products/_form.html.erb:133
#: app/views/layouts/application.html.erb:75
msgid "Cancel"
msgstr ""
Expand Down Expand Up @@ -136,7 +136,7 @@ msgstr ""
msgid "Choose a platform"
msgstr ""

#: app/views/layouts/application.html.erb:160
#: app/views/layouts/application.html.erb:198
msgid "Choose language:"
msgstr ""

Expand Down Expand Up @@ -188,11 +188,11 @@ msgstr ""
msgid "Detailed view"
msgstr ""

#: app/views/products/_form.html.erb:89 app/views/products/show.html.erb:61
#: app/views/products/_form.html.erb:90 app/views/products/show.html.erb:61
msgid "Downloads"
msgstr ""

#: app/views/products/_form.html.erb:141
#: app/views/products/_form.html.erb:142
msgid "Drag an image here!"
msgstr ""

Expand Down Expand Up @@ -225,15 +225,15 @@ msgstr ""
msgid "Featured"
msgstr ""

#: app/views/users/_form.html.erb:55
#: app/views/users/_form.html.erb:57
msgid "Female"
msgstr ""

#: app/views/products/_form.html.erb:19
msgid "Fields marked with asterisk (*) are compulsory"
msgstr ""

#: app/views/products/_form.html.erb:105
#: app/views/products/_form.html.erb:106
msgid "File"
msgstr ""

Expand All @@ -249,13 +249,13 @@ msgstr ""
msgid "Grant administrator role"
msgstr ""

#: app/views/products/_form.html.erb:119
#: app/views/products/_form.html.erb:120
msgid ""
"I accept the OtaSizzle \"%{link_begin}Publisher Terms and Conditions"
"%{link_end}\""
msgstr ""

#: app/views/users/_form.html.erb:111
#: app/views/users/_form.html.erb:113
msgid "I accept the OtaSizzle \"%{link_begin}Terms and Conditions%{link_end}\""
msgstr ""

Expand All @@ -269,7 +269,7 @@ msgstr ""
msgid "Image url"
msgstr ""

#: app/views/users/_form.html.erb:8
#: app/views/users/_form.html.erb:9
msgid ""
"In order to register, you must accept the OtaSizzle \"Terms and Conditions\"."
msgstr ""
Expand Down Expand Up @@ -338,7 +338,7 @@ msgstr ""
msgid "Logged in as "
msgstr ""

#: app/views/sessions/index.html.erb:11 app/views/users/_login_menu.html.erb:2
#: app/views/sessions/index.html.erb:12 app/views/users/_login_menu.html.erb:2
msgid "Login"
msgstr ""

Expand All @@ -354,19 +354,19 @@ msgstr ""
msgid "Logout"
msgstr ""

#: app/controllers/sessions_controller.rb:44
#: app/controllers/sessions_controller.rb:62
msgid "Logout successful"
msgstr ""

#: app/views/products/show.html.erb:120
msgid "Make featured"
msgstr ""

#: app/views/users/_form.html.erb:55
#: app/views/users/_form.html.erb:57
msgid "Male"
msgstr ""

#: app/views/layouts/application.html.erb:234
#: app/views/layouts/application.html.erb:272
msgid "My Apps"
msgstr ""

Expand All @@ -381,7 +381,7 @@ msgstr ""
msgid "Name of the product"
msgstr ""

#: app/views/layouts/application.html.erb:235
#: app/views/layouts/application.html.erb:273
msgid "New App"
msgstr ""

Expand All @@ -401,7 +401,7 @@ msgstr ""
msgid "New comment created."
msgstr ""

#: app/views/layouts/application.html.erb:251
#: app/views/layouts/application.html.erb:289
msgid "New products"
msgstr ""

Expand All @@ -417,7 +417,7 @@ msgstr ""
msgid "Number of views"
msgstr ""

#: app/views/sessions/index.html.erb:9
#: app/views/sessions/index.html.erb:10
msgid "Password"
msgstr ""

Expand All @@ -439,7 +439,7 @@ msgstr ""
msgid "Platform was successufully deleted."
msgstr ""

#: app/views/layouts/application.html.erb:265
#: app/views/layouts/application.html.erb:303
msgid "Platforms"
msgstr ""

Expand All @@ -459,19 +459,19 @@ msgstr ""
msgid "Popularity: "
msgstr ""

#: app/controllers/products_controller.rb:136
#: app/controllers/products_controller.rb:137
msgid "Product was successfully created."
msgstr ""

#: app/controllers/products_controller.rb:154
#: app/controllers/products_controller.rb:155
msgid "Product was successfully updated."
msgstr ""

#: app/views/platforms/show.html.erb:14 app/views/categories/show.html.erb:14
msgid "Products"
msgstr ""

#: app/views/layouts/application.html.erb:254
#: app/views/layouts/application.html.erb:292
msgid "Products pending approval"
msgstr ""

Expand Down Expand Up @@ -511,11 +511,11 @@ msgstr ""
msgid "Rating was successfully created/updated."
msgstr ""

#: app/views/users/_form.html.erb:101
#: app/views/users/_form.html.erb:103
msgid "Receive admin e-mail"
msgstr ""

#: app/views/users/_form.html.erb:121 app/views/users/_login_menu.html.erb:3
#: app/views/users/_form.html.erb:123 app/views/users/_login_menu.html.erb:3
msgid "Register"
msgstr ""

Expand Down Expand Up @@ -544,7 +544,7 @@ msgstr ""
msgid "Revoke administrator role"
msgstr ""

#: app/views/users/_form.html.erb:121
#: app/views/users/_form.html.erb:123
msgid "Save"
msgstr ""

Expand All @@ -566,7 +566,7 @@ msgstr ""
msgid "State:"
msgstr ""

#: app/views/products/_form.html.erb:132 app/views/platforms/_form.html.erb:25
#: app/views/products/_form.html.erb:133 app/views/platforms/_form.html.erb:25
#: app/views/categories/new.html.erb:25 app/views/categories/edit.html.erb:25
msgid "Submit"
msgstr ""
Expand All @@ -576,7 +576,7 @@ msgstr ""
msgid "Tags"
msgstr ""

#: app/views/products/_form.html.erb:115
#: app/views/products/_form.html.erb:116
msgid "Terms and conditions"
msgstr ""

Expand All @@ -585,7 +585,7 @@ msgid ""
"These comments are only shown to administrators and %{comments_shown_for}."
msgstr ""

#: app/views/products/_form.html.erb:102
#: app/views/products/_form.html.erb:103
msgid "Title"
msgstr ""

Expand All @@ -597,7 +597,7 @@ msgstr ""
msgid "URL"
msgstr ""

#: app/views/users/_form.html.erb:55
#: app/views/users/_form.html.erb:57
msgid "Unspecified"
msgstr ""

Expand All @@ -609,12 +609,12 @@ msgstr ""
msgid "User was successfully updated."
msgstr ""

#: app/views/sessions/index.html.erb:7 app/views/users/show.html.erb:4
#: app/views/sessions/index.html.erb:8 app/views/users/show.html.erb:4
#: app/views/users/index.html.erb:6
msgid "Username"
msgstr ""

#: app/views/layouts/application.html.erb:262
#: app/views/layouts/application.html.erb:300
msgid "Users"
msgstr ""

Expand All @@ -631,10 +631,13 @@ msgid "Validation errors prohibited this rating from being saved"
msgstr ""

#: app/views/categories/new.html.erb:4 app/views/categories/edit.html.erb:4
#: app/views/users/_form.html.erb:4
msgid "Validation errors prohibited this user from being saved"
msgstr ""

#: app/views/users/_form.html.erb:4
msgid "Validation errors prohibited user information from being saved"
msgstr ""

#: app/controllers/comments_controller.rb:41
msgid "Your comment was not updated."
msgstr ""
Expand All @@ -647,7 +650,7 @@ msgstr ""
msgid "Your rating:"
msgstr ""

#: app/views/layouts/application.html.erb:247
#: app/views/layouts/application.html.erb:285
msgid "admin"
msgstr ""

Expand All @@ -659,7 +662,7 @@ msgstr ""
msgid "blocked"
msgstr ""

#: app/views/layouts/application.html.erb:219
#: app/views/layouts/application.html.erb:257
msgid "browse"
msgstr ""

Expand All @@ -683,7 +686,7 @@ msgstr ""
msgid "comments_shown_for|you"
msgstr ""

#: app/views/layouts/application.html.erb:218
#: app/views/layouts/application.html.erb:256
msgid "home"
msgstr ""

Expand Down Expand Up @@ -715,7 +718,7 @@ msgstr ""
msgid "not yet rated"
msgstr ""

#: app/views/layouts/application.html.erb:231
#: app/views/layouts/application.html.erb:269
msgid "publish"
msgstr ""

Expand Down
Loading

0 comments on commit 8d9198e

Please sign in to comment.