Mercurial > kallithea

changeset 3717:6ff98871247a beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor changes
author Mads Kiilerich <madski@unity3d.com>
date Fri, 05 Apr 2013 02:51:37 +0200
parents 355fcdd2c027
children b2575bdb847c
files rhodecode/model/db.py rhodecode/model/scm.py rhodecode/public/css/contextbar.css rhodecode/templates/admin/repos/repo_edit.html rhodecode/templates/pullrequests/pullrequest_show.html rhodecode/templates/summary/summary.html
diffstat 6 files changed, 9 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/model/db.py	Mon Apr 08 23:57:14 2013 +0200
+++ b/rhodecode/model/db.py	Fri Apr 05 02:51:37 2013 +0200
@@ -1166,7 +1166,7 @@
         """
         Mark caches of this repo as invalid.
         """
-        CacheInvalidation.set_invalidate(repo_name=self.repo_name)
+        CacheInvalidation.set_invalidate(self.repo_name)
 
     def scm_instance_no_cache(self):
         return self.__get_instance()
--- a/rhodecode/model/scm.py	Mon Apr 08 23:57:14 2013 +0200
+++ b/rhodecode/model/scm.py	Fri Apr 05 02:51:37 2013 +0200
@@ -105,8 +105,7 @@
             scmr = dbr.scm_instance_cached(cache_map)
             # check permission at this level
             if not HasRepoPermissionAny(
-                *self.perm_set
-            )(dbr.repo_name, 'get repo check'):
+                *self.perm_set)(dbr.repo_name, 'get repo check'):
                 continue
 
             try:
@@ -151,8 +150,7 @@
         for dbr in self.db_repo_list:
             # check permission at this level
             if not HasRepoPermissionAny(
-                *self.perm_set
-            )(dbr.repo_name, 'get repo check'):
+                *self.perm_set)(dbr.repo_name, 'get repo check'):
                 continue
 
             tmp_d = {}
--- a/rhodecode/public/css/contextbar.css	Mon Apr 08 23:57:14 2013 +0200
+++ b/rhodecode/public/css/contextbar.css	Fri Apr 05 02:51:37 2013 +0200
@@ -247,6 +247,7 @@
     border-left: 1px solid rgba(255,255,255,0.1);
     padding: 0;
 }
+
 #header #header-inner #quick li:last-child,
 #content #context-pages li:last-child {
     border-right: none;
--- a/rhodecode/templates/admin/repos/repo_edit.html	Mon Apr 08 23:57:14 2013 +0200
+++ b/rhodecode/templates/admin/repos/repo_edit.html	Fri Apr 05 02:51:37 2013 +0200
@@ -275,7 +275,7 @@
            ${h.submit('set_unlock' ,_('Unlock locked repo'),class_="ui-btn",onclick="return confirm('"+_('Confirm to unlock repository')+"');")}
            ${'Locked by %s on %s' % (h.person_by_id(c.repo_info.locked[0]),h.fmt_date(h.time_to_datetime(c.repo_info.locked[1])))}
           %else:
-            ${h.submit('set_lock',_('lock repo'),class_="ui-btn",onclick="return confirm('"+_('Confirm to lock repository')+"');")}
+            ${h.submit('set_lock',_('Lock repo'),class_="ui-btn",onclick="return confirm('"+_('Confirm to lock repository')+"');")}
             ${_('Repository is not locked')}
           %endif
        </div>
@@ -293,7 +293,7 @@
     <div class="form">
        <div class="fields">
            ${h.select('id_fork_of','',c.repos_list,class_="medium")}
-           ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('set'),class_="ui-btn",)}
+           ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="ui-btn",)}
        </div>
            <div class="field" style="border:none;color:#888">
            <ul>
--- a/rhodecode/templates/pullrequests/pullrequest_show.html	Mon Apr 08 23:57:14 2013 +0200
+++ b/rhodecode/templates/pullrequests/pullrequest_show.html	Fri Apr 05 02:51:37 2013 +0200
@@ -78,7 +78,7 @@
          </div>
          <div class="field">
           <div class="label-summary">
-              <label>${_('Summary')}:</label>
+              <label>${_('Description')}:</label>
           </div>
           <div class="input">
               <div style="white-space:pre-wrap">${h.literal(c.pull_request.description)}</div>
--- a/rhodecode/templates/summary/summary.html	Mon Apr 08 23:57:14 2013 +0200
+++ b/rhodecode/templates/summary/summary.html	Fri Apr 05 02:51:37 2013 +0200
@@ -148,7 +148,7 @@
                 %else:
                    ${_('Statistics are disabled for this repository')}
                    %if h.HasPermissionAll('hg.admin')('enable stats on from summary'):
-                        ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")}
+                        ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")}
                    %endif
                 %endif
               </div>
@@ -164,7 +164,7 @@
                 %elif not c.enable_downloads:
                   ${_('Downloads are disabled for this repository')}
                     %if h.HasPermissionAll('hg.admin')('enable downloads on from summary'):
-                        ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")}
+                        ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")}
                     %endif
                 %else:
                     ${h.select('download_options',c.rhodecode_repo.get_changeset().raw_id,c.download_options)}