merged with ldap fix

rhodecode/controllers/journal.py

@@ -25,10 +25,9 b' journal controller for pylons'
 
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
-from rhodecode.lib.auth import LoginRequired
+from rhodecode.lib.auth import LoginRequired, NotAnonymous
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.helpers import get_token
-from rhodecode.lib.utils import action_logger
 from rhodecode.model.db import UserLog, UserFollowing
 from rhodecode.model.scm import ScmModel
 from sqlalchemy import or_
@@ -41,6 +40,7 b' class JournalController(BaseController):'
 
 
     @LoginRequired()
+    @NotAnonymous()
     def __before__(self):
         super(JournalController, self).__before__()
 
@@ -49,12 +49,12 b' class JournalController(BaseController):'
 
         c.following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == c.rhodecode_user.user_id).all()
-        
-        repo_ids = [x.follows_repository.repo_id for x in c.following 
+
+        repo_ids = [x.follows_repository.repo_id for x in c.following
                     if x.follows_repository is not None]
-        user_ids = [x.follows_user.user_id for x in c.following 
+        user_ids = [x.follows_user.user_id for x in c.following
                     if x.follows_user is not None]
-        
+
         c.journal = self.sa.query(UserLog)\
             .filter(or_(
                         UserLog.repository_id.in_(repo_ids),
@@ -65,7 +65,6 b' class JournalController(BaseController):'
             .all()
         return render('/journal.html')
 
-
     def toggle_following(self):
 
         if request.POST.get('auth_token') == get_token():

rhodecode/model/scm.py

@@ -170,19 +170,6 b' class ScmModel(BaseModel):'
                             'repository.admin')(repo_name, 'get repo check'):
             return
 
-        pre_invalidate = True
-        if invalidation_list is not None:
-            pre_invalidate = repo_name in invalidation_list
-
-        if pre_invalidate:
-            invalidate = self._should_invalidate(repo_name)
-
-            if invalidate:
-                log.info('invalidating cache for repository %s', repo_name)
-                region_invalidate(_get_repo, None, repo_name)
-                self._mark_invalidated(invalidate)
-
-
         #======================================================================
         # CACHE FUNCTION
         #======================================================================
@@ -224,6 +211,18 b' class ScmModel(BaseModel):'
             repo.dbrepo = dbrepo
             return repo
 
+        pre_invalidate = True
+        if invalidation_list is not None:
+            pre_invalidate = repo_name in invalidation_list
+
+        if pre_invalidate:
+            invalidate = self._should_invalidate(repo_name)
+
+            if invalidate:
+                log.info('invalidating cache for repository %s', repo_name)
+                region_invalidate(_get_repo, None, repo_name)
+                self._mark_invalidated(invalidate)
+
         return _get_repo(repo_name)
 
 

rhodecode/templates/base/base.html

@@ -22,7 +22,12 b''
 	                </div>
 		            <div class="account">
 		            %if c.rhodecode_user.username == 'default':
-                        ${h.link_to('anonymous',h.url('register'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
+                        %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')(): 
+                            ${h.link_to('anonymous',h.url('register'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
+                        %else:
+                            ${h.link_to('anonymous',h.url('#'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
+                        %endif		            
+                        
                     %else:                        		            
 		            	${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
 		            %endif
@@ -31,10 +36,12 b''
 	            <li>
 	               <a href="${h.url('home')}">${_('Home')}</a>
 	            </li>
+	            %if c.rhodecode_user.username != 'default':
                 <li>
                    <a href="${h.url('journal')}">${_('Journal')}</a> 
                    ##(${c.unread_journal})</a>
                 </li>
+                %endif
                 %if c.rhodecode_user.username == 'default':
                     <li class="last highlight">${h.link_to(u'Login',h.url('login_home'))}</li>
                 %else:
@@ -257,7 +264,7 b''
                     <span>${_('Home')}</span>                 
                     </a>        
                 </li>
-                
+                %if c.rhodecode_user.username != 'default':
                 <li>
                     <a title="${_('Journal')}"  href="${h.url('journal')}">
                     <span class="icon">
@@ -266,7 +273,7 b''
                     <span>${_('Journal')}</span>                 
                     </a>        
                 </li>
-                                
+                %endif          
                 <li>
                     <a title="${_('Search')}"  href="${h.url('search')}">
                     <span class="icon">

rhodecode/templates/summary/summary.html

@@ -44,16 +44,17 b''
 	                <img style="margin-bottom:2px" class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="/images/icons/lock_open.png"/>
 	             %endif
 			      <span style="font-size: 1.6em;font-weight: bold;vertical-align: baseline;">${c.repo_info.name}</span>
-			      
-			      %if c.following:
-                  <span id="follow_toggle" class="following" title="${_('Stop following this repository')}"
-                        onclick="javascript:toggleFollowingRepo(${c.repo_info.dbrepo.repo_id},'${str(h.get_token())}')">
-                  </span>			      
-			      %else:
-			      <span id="follow_toggle" class="follow" title="${_('Start following this repository')}"
-			            onclick="javascript:toggleFollowingRepo(${c.repo_info.dbrepo.repo_id},'${str(h.get_token())}')">
-			      </span>
-			      %endif
+			      %if c.rhodecode_user.username != 'default':
+				      %if c.following:
+	                  <span id="follow_toggle" class="following" title="${_('Stop following this repository')}"
+	                        onclick="javascript:toggleFollowingRepo(${c.repo_info.dbrepo.repo_id},'${str(h.get_token())}')">
+	                  </span>			      
+				      %else:
+				      <span id="follow_toggle" class="follow" title="${_('Start following this repository')}"
+				            onclick="javascript:toggleFollowingRepo(${c.repo_info.dbrepo.repo_id},'${str(h.get_token())}')">
+				      </span>
+				      %endif
+				  %endif:
 			      <br/>
 		            %if c.repo_info.dbrepo.fork:
 		            	<span style="margin-top:5px">