diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2011-10-31 23:10:11 +0200 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2011-10-31 23:10:11 +0200 |
| commit | 673959ac755b6374679ae57c845b8014d6aa5c5e (patch) | |
| tree | 8bb940917d87e63733329bb0e3195930669d7b01 | |
| parent | e3e70eaed52a96c79b4610bce4b16b0b79d7a5f6 (diff) | |
implements #293 gravatar link should be disabled when use_gravatar = false
--HG--
extra : source : 2196aa27954b73924dc655266bbc4ea37c8b45e5
| -rw-r--r-- | rhodecode/lib/base.py | 17 | ||||
| -rw-r--r-- | rhodecode/lib/helpers.py | 4 | ||||
| -rw-r--r-- | rhodecode/templates/admin/users/user_edit.html | 11 | ||||
| -rw-r--r-- | rhodecode/templates/admin/users/user_edit_my_account.html | 8 |
4 files changed, 24 insertions, 16 deletions
diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py index 08af9438..16c8faf7 100644 --- a/rhodecode/lib/base.py +++ b/rhodecode/lib/base.py @@ -10,6 +10,7 @@ from pylons.controllers.util import redirect from pylons.templating import render_mako as render from rhodecode import __version__ +from rhodecode.lib import str2bool from rhodecode.lib.auth import AuthUser from rhodecode.lib.utils import get_repo_slug from rhodecode.model import meta @@ -24,6 +25,7 @@ class BaseController(WSGIController): def __before__(self): c.rhodecode_version = __version__ c.rhodecode_name = config.get('rhodecode_title') + c.use_gravatar = str2bool(config.get('use_gravatar')) c.ga_code = config.get('rhodecode_ga_code') c.repo_name = get_repo_slug(request) c.backends = BACKENDS.keys() @@ -32,8 +34,6 @@ class BaseController(WSGIController): self.sa = meta.Session() self.scm_model = ScmModel(self.sa) - #c.unread_journal = scm_model.get_unread_journal() - def __call__(self, environ, start_response): """Invoke the Controller""" # WSGIController.__call__ dispatches to the Controller method @@ -56,11 +56,13 @@ class BaseController(WSGIController): class BaseRepoController(BaseController): """ - Base class for controllers responsible for loading all needed data - for those controllers, loaded items are - - c.rhodecode_repo: instance of scm repository (taken from cache) + Base class for controllers responsible for loading all needed data for + repository loaded items are + c.rhodecode_repo: instance of scm repository + c.rhodecode_db_repo: instance of db + c.repository_followers: number of followers + c.repository_forks: number of forks """ def __before__(self): @@ -76,7 +78,6 @@ class BaseRepoController(BaseController): redirect(url('home')) - c.repository_followers = \ - self.scm_model.get_followers(c.repo_name) + c.repository_followers = self.scm_model.get_followers(c.repo_name) c.repository_forks = self.scm_model.get_forks(c.repo_name) diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py index dcba235a..04ac7d44 100644 --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -454,8 +454,8 @@ HasRepoPermissionAny, HasRepoPermissionAll #============================================================================== def gravatar_url(email_address, size=30): - if not str2bool(config['app_conf'].get('use_gravatar')) or \ - email_address == 'anonymous@rhodecode.org': + if (not str2bool(config['app_conf'].get('use_gravatar')) or + not email_address or email_address == 'anonymous@rhodecode.org'): return url("/images/user%s.png" % size) ssl_enabled = 'https' == request.environ.get('wsgi.url_scheme') diff --git a/rhodecode/templates/admin/users/user_edit.html b/rhodecode/templates/admin/users/user_edit.html index 58a623c8..25c0e31b 100644 --- a/rhodecode/templates/admin/users/user_edit.html +++ b/rhodecode/templates/admin/users/user_edit.html @@ -29,10 +29,13 @@ <div class="field"> <div class="gravatar_box"> <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div> - <p> - <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong><br/> - ${_('Using')} ${c.user.email} - </p> + <p> + %if c.use_gravatar: + <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong> + <br/>${_('Using')} ${c.user.email} + %else: + <br/>${c.user.email} + %endif </div> </div> <div class="field"> diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html index 964e3a93..d26ad8a0 100644 --- a/rhodecode/templates/admin/users/user_edit_my_account.html +++ b/rhodecode/templates/admin/users/user_edit_my_account.html @@ -29,8 +29,12 @@ <div class="gravatar_box"> <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div> <p> - <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong><br/> - ${_('Using')} ${c.user.email} + %if c.use_gravatar: + <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong> + <br/>${_('Using')} ${c.user.email} + %else: + <br/>${c.user.email} + %endif </p> </div> </div> |