Merge pull request #310 from warpc/252-user_appeal

[refs #252] fixed appeal to user in email and in welcome message in activity feed

app/models/activity_feed_observer.rb

@@ -7,7 +7,7 @@ class ActivityFeedObserver < ActiveRecord::Observer
       ActivityFeed.create(
         :user => record,
         :kind => 'new_user_notification',
-        :data => {:user_name => record.name, :user_email => record.email}
+        :data => {:user_name => record.user_appeal, :user_email => record.email}
       )
 
     when 'Issue'

app/models/user.rb

@@ -120,6 +120,10 @@ class User < ActiveRecord::Base
     end
   end
 
+  def user_appeal
+    name.blank? ? uname : name
+  end
+
   private
 
   def create_settings_notifier

app/views/user_mailer/invite_approve_notification.html.haml

@@ -1,4 +1,4 @@
-%p== Здравствуйте, #{@register_request.name}.
+%p== Здравствуйте, #{@register_request.name || @register_request.email}.
 
 %p
   Вы приглашены в проект ABF. Чтобы зарегистрироваться перейдите по

app/views/user_mailer/issue_assign_notification.en.haml

@@ -1,4 +1,4 @@
-%p== Hello, #{@user.name}.
+%p== Hello, #{@user.user_appeal}.
 
 
 %p You have been assigned to issue #{ link_to @issue.title, project_issue_url(@issue.project, @issue) }

app/views/user_mailer/issue_assign_notification.ru.haml

@@ -1,4 +1,4 @@
-%p== Здравствуйте, #{@user.name}.
+%p== Здравствуйте, #{@user.user_appeal}.
 
 
 %p Вам была назначена задача #{ link_to @issue.title, project_issue_url(@issue.project, @issue) }

app/views/user_mailer/new_comment_notification.en.haml

@@ -1,4 +1,4 @@
-%p== Hello, #{@user.name}.
+%p== Hello, #{@user.user_appeal}.
 
 - if @comment.commentable.class == Issue
   - link = link_to @comment.commentable.title, project_issue_url(@comment.commentable.project, @comment.commentable)

app/views/user_mailer/new_comment_notification.ru.haml

@@ -1,4 +1,4 @@
-%p== Здравствуйте, #{@user.name}.
+%p== Здравствуйте, #{@user.user_appeal}.
 
 - if @comment.commentable.class == Issue
   - link = link_to @comment.commentable.title, project_issue_url(@comment.commentable.project, @comment.commentable)

app/views/user_mailer/new_issue_notification.en.haml

@@ -1,4 +1,4 @@
-%p== Hello, #{@user.name}.
+%p== Hello, #{@user.user_appeal}.
 
 
 %p To project #{ link_to @issue.project.name, project_url(@issue.project) } has been added an issue #{ link_to @issue.title, project_issue_url(@issue.project, @issue) }

app/views/user_mailer/new_issue_notification.ru.haml

@@ -1,4 +1,4 @@
-%p== Здравствуйте, #{@user.name}.
+%p== Здравствуйте, #{@user.user_appeal}.
 
 
 %p К проекту #{ link_to @issue.project.name, project_url(@issue.project) } была добавлена задача #{ link_to @issue.title, project_issue_url(@issue.project, @issue) }

app/views/user_mailer/new_user_notification.en.haml

@@ -1,4 +1,4 @@
-%p== Hello, #{@user.name}.
+%p== Hello, #{@user.user_appeal}.
 
 
 %p You have been sign up to project «ROSA Build System» and now can sign in.

app/views/user_mailer/new_user_notification.ru.haml

@@ -1,4 +1,4 @@
-%p== Здравствуйте, #{@user.name}.
+%p== Здравствуйте, #{@user.user_appeal}.
 
 
 %p Вы зарегистрированы на проекте «ROSA Build System» и теперь можете войти в систему.