Mercurial > public > src > rhodecode

changeset 1191:31e82d872631 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disabled api key for anonymous users, and added api_key to rss/atom links for other users
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 09 Mar 2011 20:46:20 +0100
parents f3f847712f87
children 9472a0150bf0
files rhodecode/lib/auth.py rhodecode/templates/index.html rhodecode/templates/summary/summary.html
diffstat 3 files changed, 17 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/auth.py	Wed Mar 09 20:26:02 2011 +0100
+++ b/rhodecode/lib/auth.py	Wed Mar 09 20:46:20 2011 +0100
@@ -246,7 +246,7 @@
     def propagate_data(self):
         user_model = UserModel()
         self.anonymous_user = user_model.get_by_username('default', cache=True)
-        if self._api_key:
+        if self._api_key and self._api_key != self.anonymous_user.api_key:
             #try go get user by api key
             log.debug('Auth User lookup by API KEY %s', self._api_key)
             user_model.fill_data(self, api_key=self._api_key)
--- a/rhodecode/templates/index.html	Wed Mar 09 20:26:02 2011 +0100
+++ b/rhodecode/templates/index.html	Wed Mar 09 20:46:20 2011 +0100
@@ -107,10 +107,18 @@
 		            </td>
 		            <td title="${repo['contact']}">${h.person(repo['contact'])}</td>
 		            <td>
-		                <a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_icon"  href="${h.url('rss_feed_home',repo_name=repo['name'])}"></a>
+		              %if c.rhodecode_user.username != 'default':
+		                <a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_icon"  href="${h.url('rss_feed_home',repo_name=repo['name'],api_key=c.rhodecode_user.api_key)}"></a>
+                      %else:
+                        <a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_icon"  href="${h.url('rss_feed_home',repo_name=repo['name'])}"></a>
+                      %endif:		                
 		            </td>        
 		            <td>
+		              %if c.rhodecode_user.username != 'default':
+		                <a title="${_('Subscribe to %s atom feed')%repo['name']}"  class="atom_icon" href="${h.url('atom_feed_home',repo_name=repo['name'],api_key=c.rhodecode_user.api_key)}"></a>
+		              %else:
 		                <a title="${_('Subscribe to %s atom feed')%repo['name']}"  class="atom_icon" href="${h.url('atom_feed_home',repo_name=repo['name'])}"></a>
+		              %endif:
 		            </td>
 		        </tr>
 		    %endfor
--- a/rhodecode/templates/summary/summary.html	Wed Mar 09 20:26:02 2011 +0100
+++ b/rhodecode/templates/summary/summary.html	Wed Mar 09 20:46:20 2011 +0100
@@ -165,8 +165,13 @@
 			      <label>${_('Feeds')}:</label>
 			  </div>
 			  <div class="input-short">
-	            ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.repo.name),class_='rss_icon')}
-	            ${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.repo.name),class_='atom_icon')}
+			   %if c.rhodecode_user.username != 'default':
+	            ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.repo.name,api_key=c.rhodecode_user.api_key),class_='rss_icon')}
+	            ${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.repo.name,api_key=c.rhodecode_user.api_key),class_='atom_icon')}
+	           %else:
+                ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.repo.name,class_='rss_icon')}
+                ${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.repo.name),class_='atom_icon')}	           
+	           %endif 
 			  </div>
 			 </div>				 			 			 
 	  </div>