kallithea Changeset - 31e82d872631

Changeset - 31e82d872631

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2011-03-09 20:46:20
marcin@python-works.com

disabled api key for anonymous users, and added api_key to rss/atom links for other users

3 files changed with 17 insertions and 4 deletions:

rhodecode/lib/auth.py

rhodecode/templates/index.html

rhodecode/templates/summary/summary.html

0 comments (0 inline, 0 general)

rhodecode/lib/auth.py

➞

Show inline comments

@@ @@ -246,7 +246,7 @@ class AuthUser(object): @@
     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)

rhodecode/templates/index.html

➞

Show inline comments

@@ @@ -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

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -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>

0 comments (0 inline, 0 general)