Download as
Browse Code »

Commit 8b8feb7c9420d2f2d7b4f59bb2ea60d18be5f560

Authored by Antonio Terceiro
1 parent 5bedd4b0
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem628: several reviews

Showing 5 changed files with 21 additions and 5 deletions   Show diff stats
app/models/approve_article.rb
  Diff comments   View file @8b8feb7
... ... @@ -4,7 +4,7 @@ class ApproveArticle < Task
4 4 validates_presence_of :requestor_id, :target_id
5 5  
6 6 def description
7   - _('%s wants to publish %s') % [requestor.name, article.name]
  7 + _('%{author} wants to publish "%{article}" on %{community}') % { :author => requestor.name, :article => article.title, :community => target.name }
8 8 end
9 9  
10 10 def data
... ... @@ -41,7 +41,7 @@ class ApproveArticle < Task
41 41  
42 42 def target_notification_message
43 43 description + "\n\n" +
44   - _('You need login to accept this.')
  44 + _('You need to login on %{system} in order to approve or reject this article. You can use the address below to do that.') % { :system => target.environment.name }
45 45 end
46 46  
47 47 end
... ...
app/models/person.rb
  Diff comments   View file @8b8feb7
... ... @@ -141,6 +141,11 @@ class Person < Profile
141 141 self.user.nil? ? nil : self.user.email
142 142 end
143 143  
  144 + # Returns the user e-mail.
  145 + def contact_email
  146 + email
  147 + end
  148 +
144 149 def email= (email)
145 150 self.user.email = email if ! self.user.nil?
146 151 end
... ...
app/models/profile.rb
  Diff comments   View file @8b8feb7
... ... @@ -226,12 +226,11 @@ class Profile < ActiveRecord::Base
226 226  
227 227 xss_terminate :only => [ :name, :nickname, :address, :contact_phone ]
228 228  
229   - # returns the contact email for this profile. By default returns the the
230   - # e-mail of the owner user.
  229 + # returns the contact email for this profile.
231 230 #
232 231 # Subclasses may -- and should -- override this method.
233 232 def contact_email
234   - self.user ? self.user.email : nil
  233 + raise NotImplementedError
235 234 end
236 235  
237 236 # gets recent documents in this profile, ordered from the most recent to the
... ...
test/unit/person_test.rb
  Diff comments   View file @8b8feb7
... ... @@ -112,6 +112,12 @@ class PersonTest < Test::Unit::TestCase
112 112 assert_nil p.email
113 113 end
114 114  
  115 + should 'use email addreess as contact email' do
  116 + p = Person.new
  117 + p.stubs(:email).returns('my@email.com')
  118 + assert_equal 'my@email.com', p.contact_email
  119 + end
  120 +
115 121 should 'set email through person instance' do
116 122 u = create_user('testuser')
117 123 p = u.person
... ...
test/unit/profile_test.rb
  Diff comments   View file @8b8feb7
... ... @@ -1133,6 +1133,12 @@ class ProfileTest < Test::Unit::TestCase
1133 1133 assert_equal [p], c.admins
1134 1134 end
1135 1135  
  1136 + should 'not implement contact_email' do
  1137 + assert_raise NotImplementedError do
  1138 + Profile.new.contact_email
  1139 + end
  1140 + end
  1141 +
1136 1142 private
1137 1143  
1138 1144 def assert_invalid_identifier(id)
... ...