my_forum 0.0.1.beta42 → 0.0.1.beta43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50b1db333d9e70df0dc190ede0c0ca5fd0c07b02
-  data.tar.gz: 416c97311f6a6383395f7d845dcc6c27a1f1cb49
+  metadata.gz: 898dfc20ccc1570159c8b166757647cd1561ac69
+  data.tar.gz: 3d36e03985b31c140e2c2d32eb92557cd3df6026
 SHA512:
-  metadata.gz: 14eb269a8a94b0537d0ae1833a6d6baa639ce6953bd7ee65eae87e0911a65714938dc4af99344a27559fd60f2aafcd65a3308dde0646698dd758621600cad564
-  data.tar.gz: 79aa72eb79131a5bef00bfe0696c437a727f274fa277c618f4019f26b1cc151b623479ed8ee7c36b8cc1c073bc07f95cf16f7392f31c96f8d7ed310fe747e0f3
+  metadata.gz: 7e251953aa891fef3009d0a77de913a8958962db75616b89a04a780b02373e0cea92a77664b34d2edc464f3ba762da3d5390e548dd6374f16f843ac9c88685ad
+  data.tar.gz: 286758629f312cb16c798682f04cc5dbaf6b87a168cdd8c93bd19135af5b1851cfa9c3c40dff348280c50870beeb4a1b6e7265d7b97fe675ac8ab3b436cf991c

data/app/controllers/my_forum/users_controller.rb

@@ -21,6 +21,8 @@ module MyForum
         current_user.update(attr => params[:user][attr]) if params[:user][attr]
       end
 
+      flash[:notice] = t('.successfully_updated')
+
       redirect_to edit_user_path(current_user)
     end
 
@@ -30,7 +32,7 @@ module MyForum
         @user.user_groups << UserGroup::MEMBER_GROUP
         @user.save
         session[:user_id] = @user.id
-        redirect_to root_path
+        redirect_to edit_user_path(@user)
       else
         render :new
       end

data/app/helpers/my_forum/application_helper.rb

@@ -22,7 +22,8 @@ module MyForum
     end
 
     def online_users
-      User.online.pluck(:login).join(', ')
+      users_list = User.online.pluck(:login).join(', ')
+      users_list.blank? ? I18n.t('my_forum.no_online_users') : users_list
     end
 
     def today_was_users

data/app/views/my_forum/users/edit.haml

@@ -2,7 +2,6 @@
 
 .row
   .col-md-4
-
     = errors_for(current_user)
 
     = form_for current_user, url: user_path(current_user), role: 'form' do |form|
@@ -33,4 +32,9 @@
       - additional_info_attrs.each do |attr|
         .form-group= form.text_field attr, value: current_user.send(attr), class: 'name form-control', placeholder: t("my_forum.additional_info.#{attr.to_s}")
 
-      = form.submit t('.update'), class: 'btn btn-primary btn-sm'
+      = form.submit t('.update'), class: 'btn btn-primary btn-sm'
+
+%br
+.row
+  .col-md-12.text-center
+    =link_to t('.back_to_the_forum'), root_path, class: 'btn btn-sm btn-success'

data/config/locales/ru.yml

@@ -1,6 +1,7 @@
 ru:
   today: "Сегодня"
   my_forum:
+    no_online_users: 'никого нет :('
     pm:
       sent: 'Сообщение отправленно'
     mailer:
@@ -142,6 +143,9 @@ ru:
         update: 'Обновить'
         update_avatar: 'Обновить аватар'
         edit_additional_info: 'Дополнительная информация'
+        back_to_the_forum: 'Вернуться на форум'
+      update:
+        successfully_updated: 'Данные обновлены'
 
 
     private_messages:

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta42"
+  VERSION = "0.0.1.beta43"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta42
+  version: 0.0.1.beta43
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails