Merge branch 'release/v5'

app/models/user.rb

@@ -7,7 +7,8 @@ class User < ActiveRecord::Base
   attr_accessible :email, :password,
                   :first_name, :last_name, :city,
                   :company, :position,
-                  :show_as_participant, :photo, :state_event, :about
+                  :show_as_participant,
+                  :photo, :state_event, :about
 
   audit :email, :password, :first_name, :last_name, :city, :company, :show_as_participant, :photo, :state, :about
 

app/types/user_registration_type.rb

@@ -1,14 +1,15 @@
 class UserRegistrationType < User
   include BasicType
 
-  attr_accessible :password_confirmation, :state_event
+  attr_accessible :password_confirmation, :state_event, :process_personal_data
 
   #has_secure_password
 
   validates :first_name,  presence: true
   validates :last_name,  presence: true
   validates :city, presence: true
   validates :password, presence: true, confirmation: true
+  validates :process_personal_data, acceptance: { accept: true }
 
 
   def city=(city)

app/views/web/admin/users/_form.html.haml

@@ -13,6 +13,7 @@
       = f.input :password_confirmation
       = f.input :photo, as: :image_preview
       = f.input :show_as_participant
+      = f.input :admin
       = f.input :role
       = f.association :topics, as: :chosen_select, input_html: { multiple: true }
 

app/views/web/users/_form.html.haml

@@ -37,6 +37,8 @@
             .row-fluid
               .span4
                 = f.input :show_as_participant, :input_html => { :checked => true }, :wrapper => :inline_checkbox
+              .span6
+                = f.input :process_personal_data, as: :boolean, :input_html => { :checked => true }, :wrapper => :inline_checkbox
             .center.form-actions
               = f.button :submit, class: 'btn'
 

app/views/web/users/index.html.haml

@@ -4,7 +4,7 @@
 %table.table.table-striped
   %thead
     %tr
-      %th= sort_link(@search, :first_name, User.human_attribute_name(:first_name)) 
+      %th= sort_link(@search, :last_name, User.human_attribute_name(:first_name)) 
       %th= sort_link(@search, :city, User.human_attribute_name(:city))
       %th= sort_link(@search, :company, User.human_attribute_name(:company))
       %th= sort_link(@search, :position, User.human_attribute_name(:position))

config/locales/activerecord.yml

@@ -23,6 +23,7 @@ ru:
         company: "Компания"
         position: "Должность"
         show_as_participant: "Показывать на странице участников"
+        process_personal_data: "Согласен на обработку моих персональных данных"
         photo: "Фото"
         state_event: "Изменить состояние"
         state: "Состояние"
@@ -68,3 +69,7 @@ ru:
             email:
               email: 'Введен некорректный email'
               taken: 'Данный Email уже зарегистрирован'
+            process_personal_data:
+              blank: "Необходимо дать согласие на обработку персональных данных"
+              #blank: 'Согласиться вы должны (с) Йода'
+

log/untranslated.ru.yml

@@ -1,13 +1,9 @@
 ---
 ru:
-  web:
-    admin:
-      audits:
-        index:
-          title: ''
-  layouts:
-    web:
-      admin:
-        shared:
-          navigation:
-            audits: ''
+  activerecord:
+    errors:
+      models:
+        user:
+          attributes:
+            state:
+              invalid_transition: ''

test/factories/sequences.rb

@@ -16,4 +16,8 @@
     n % 2
   end
 
+  sequence :process_personal_data do |n|
+    true
+  end
+
 end

test/factories/user.rb

@@ -11,6 +11,7 @@
     show_as_participant
     email
     photo
+#    process_personal_data
 
     after(:create) do |u|
       u.activate