nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3649 from movilla/display_registration

Browse source 
Fix "if display_password_reset_link?" when diaspora.yml => enable_registrations: false
This commit is contained in:
Jonne Haß 2012-10-10 08:31:04 -07:00
commit d979ac4499
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog.md
View file

@ -1,5 +1,9 @@
# 0.0.2.0pre # 0.0.2.0pre
Fix error with open/close registrations.
Fix javascripts error in invitations facebox.
Fix css overflow problem in aspect dropdown on welcome page.
# 0.0.1.1 # 0.0.1.1
Fix syntax error in French Javascript pluralization rule. Fix syntax error in French Javascript pluralization rule.

2
app/helpers/sessions_helper.rb
View file

@ -9,7 +9,7 @@ module SessionsHelper
end end
def display_registration_link? def display_registration_link?
!AppConfig.settings.enable_registrations? && devise_mapping.registerable? && controller_name != 'registrations' AppConfig.settings.enable_registrations? && devise_mapping.registerable? && controller_name != 'registrations'
end end
def display_password_reset_link? def display_password_reset_link?