Download as
Browse Code »

Commit 8512674f250eb38cc198ea8073a3b83ebd8a7334

Authored by AntonioTerceiro
1 parent 99342898
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem280: marking TODO to remove ugly hacks 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1686 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 3 additions and 0 deletions   Show diff stats
app/models/change_password.rb
  Diff comments   View file @8512674
1 1 # TODO: send an e-mail with a hash code to the task after the ChangePassword is creatd -> override messages from #Task
2 2  
  3 +# FIXME remove this workaround
3 4 class HumanName
4 5 def human_name
5 6 @name
... ... @@ -16,6 +17,7 @@ class ChangePassword < Task
16 17 self[:data] ||= {}
17 18 end
18 19  
  20 + # FIXME ugly workaround
19 21 self.columns_hash['login'] = HumanName.new _('Username')
20 22 self.columns_hash['email'] = HumanName.new _('e-Mail')
21 23  
... ...
app/models/user.rb
  Diff comments   View file @8512674
... ... @@ -7,6 +7,7 @@ class User < ActiveRecord::Base
7 7 N_('User|Password')
8 8 N_('User|Password confirmation')
9 9  
  10 + # FIXME ugly workaround
10 11 def self.human_attribute_name(attrib)
11 12 case attrib.to_sym
12 13 when :login: return _('Username')
... ...