##// END OF EJS Templates
Minor changes
Mads Kiilerich -
r3717:6ff98871 beta
parent child Browse files
Show More
@@ -1166,7 +1166,7 b' class Repository(Base, BaseModel):'
1166 """
1166 """
1167 Mark caches of this repo as invalid.
1167 Mark caches of this repo as invalid.
1168 """
1168 """
1169 CacheInvalidation.set_invalidate(repo_name=self.repo_name)
1169 CacheInvalidation.set_invalidate(self.repo_name)
1170
1170
1171 def scm_instance_no_cache(self):
1171 def scm_instance_no_cache(self):
1172 return self.__get_instance()
1172 return self.__get_instance()
@@ -105,8 +105,7 b' class CachedRepoList(object):'
105 scmr = dbr.scm_instance_cached(cache_map)
105 scmr = dbr.scm_instance_cached(cache_map)
106 # check permission at this level
106 # check permission at this level
107 if not HasRepoPermissionAny(
107 if not HasRepoPermissionAny(
108 *self.perm_set
108 *self.perm_set)(dbr.repo_name, 'get repo check'):
109 )(dbr.repo_name, 'get repo check'):
110 continue
109 continue
111
110
112 try:
111 try:
@@ -151,8 +150,7 b' class SimpleCachedRepoList(CachedRepoLis'
151 for dbr in self.db_repo_list:
150 for dbr in self.db_repo_list:
152 # check permission at this level
151 # check permission at this level
153 if not HasRepoPermissionAny(
152 if not HasRepoPermissionAny(
154 *self.perm_set
153 *self.perm_set)(dbr.repo_name, 'get repo check'):
155 )(dbr.repo_name, 'get repo check'):
156 continue
154 continue
157
155
158 tmp_d = {}
156 tmp_d = {}
@@ -247,6 +247,7 b' ul#context-actions {'
247 border-left: 1px solid rgba(255,255,255,0.1);
247 border-left: 1px solid rgba(255,255,255,0.1);
248 padding: 0;
248 padding: 0;
249 }
249 }
250
250 #header #header-inner #quick li:last-child,
251 #header #header-inner #quick li:last-child,
251 #content #context-pages li:last-child {
252 #content #context-pages li:last-child {
252 border-right: none;
253 border-right: none;
@@ -275,7 +275,7 b''
275 ${h.submit('set_unlock' ,_('Unlock locked repo'),class_="ui-btn",onclick="return confirm('"+_('Confirm to unlock repository')+"');")}
275 ${h.submit('set_unlock' ,_('Unlock locked repo'),class_="ui-btn",onclick="return confirm('"+_('Confirm to unlock repository')+"');")}
276 ${'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])))}
276 ${'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])))}
277 %else:
277 %else:
278 ${h.submit('set_lock',_('lock repo'),class_="ui-btn",onclick="return confirm('"+_('Confirm to lock repository')+"');")}
278 ${h.submit('set_lock',_('Lock repo'),class_="ui-btn",onclick="return confirm('"+_('Confirm to lock repository')+"');")}
279 ${_('Repository is not locked')}
279 ${_('Repository is not locked')}
280 %endif
280 %endif
281 </div>
281 </div>
@@ -293,7 +293,7 b''
293 <div class="form">
293 <div class="form">
294 <div class="fields">
294 <div class="fields">
295 ${h.select('id_fork_of','',c.repos_list,class_="medium")}
295 ${h.select('id_fork_of','',c.repos_list,class_="medium")}
296 ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('set'),class_="ui-btn",)}
296 ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="ui-btn",)}
297 </div>
297 </div>
298 <div class="field" style="border:none;color:#888">
298 <div class="field" style="border:none;color:#888">
299 <ul>
299 <ul>
@@ -78,7 +78,7 b''
78 </div>
78 </div>
79 <div class="field">
79 <div class="field">
80 <div class="label-summary">
80 <div class="label-summary">
81 <label>${_('Summary')}:</label>
81 <label>${_('Description')}:</label>
82 </div>
82 </div>
83 <div class="input">
83 <div class="input">
84 <div style="white-space:pre-wrap">${h.literal(c.pull_request.description)}</div>
84 <div style="white-space:pre-wrap">${h.literal(c.pull_request.description)}</div>
@@ -148,7 +148,7 b' window.onhashchange = function() {'
148 %else:
148 %else:
149 ${_('Statistics are disabled for this repository')}
149 ${_('Statistics are disabled for this repository')}
150 %if h.HasPermissionAll('hg.admin')('enable stats on from summary'):
150 %if h.HasPermissionAll('hg.admin')('enable stats on from summary'):
151 ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")}
151 ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")}
152 %endif
152 %endif
153 %endif
153 %endif
154 </div>
154 </div>
@@ -164,7 +164,7 b' window.onhashchange = function() {'
164 %elif not c.enable_downloads:
164 %elif not c.enable_downloads:
165 ${_('Downloads are disabled for this repository')}
165 ${_('Downloads are disabled for this repository')}
166 %if h.HasPermissionAll('hg.admin')('enable downloads on from summary'):
166 %if h.HasPermissionAll('hg.admin')('enable downloads on from summary'):
167 ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")}
167 ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")}
168 %endif
168 %endif
169 %else:
169 %else:
170 ${h.select('download_options',c.rhodecode_repo.get_changeset().raw_id,c.download_options)}
170 ${h.select('download_options',c.rhodecode_repo.get_changeset().raw_id,c.download_options)}
General Comments 0
You need to be logged in to leave comments. Login now