kallithea Changeset - 322b53be49cc

Changeset - 322b53be49cc

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2010-12-28 18:17:04
marcin@python-works.com

Fixed url bug when using numeric revision in file browser,
added follow branch checkbox for browsing only changesets from current branch

3 files changed with 49 insertions and 7 deletions:

rhodecode/controllers/files.py

rhodecode/public/css/style.css

rhodecode/templates/files/files_browser.html

0 comments (0 inline, 0 general)

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -36,70 +36,85 @@ from pylons.controllers.util import redi @@
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.utils import EmptyChangeset
 from rhodecode.model.scm import ScmModel
 from vcs.exceptions import RepositoryError, ChangesetError, ChangesetDoesNotExistError
 from vcs.nodes import FileNode
 from vcs.utils import diffs as differ
 log = logging.getLogger(__name__)
 class FilesController(BaseController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(FilesController, self).__before__()
         c.cut_off_limit = self.cut_off_limit
     def index(self, repo_name, revision, f_path):
         hg_model = ScmModel()
         c.repo = hg_model.get_repo(c.repo_name)
         revision = request.POST.get('at_rev', None) or revision
         c.f_path = f_path
         try:
             #reditect to given revision from form
             post_revision = request.POST.get('at_rev', None)
             if post_revision:
                 post_revision = c.repo.get_changeset(post_revision).raw_id
                 redirect(url('files_home', repo_name=c.repo_name,
                              revision=post_revision, f_path=f_path))
             c.branch = request.GET.get('branch', None)
             c.f_path = f_path
             c.changeset = c.repo.get_changeset(revision)
             cur_rev = c.changeset.revision
             #prev link
             try:
                 prev_rev = c.repo.get_changeset(cur_rev).prev().raw_id
+                prev_rev = c.repo.get_changeset(cur_rev).prev(c.branch).raw_id
                 c.url_prev = url('files_home', repo_name=c.repo_name,
                              revision=prev_rev, f_path=f_path)
                 if c.branch:
                     c.url_prev += '?branch=%s' % c.branch
             except ChangesetDoesNotExistError:
                 c.url_prev = '#'
             #next link
             try:
                 next_rev = c.repo.get_changeset(cur_rev).next().raw_id
+                next_rev = c.repo.get_changeset(cur_rev).next(c.branch).raw_id
                 c.url_next = url('files_home', repo_name=c.repo_name,
                          revision=next_rev, f_path=f_path)
                 if c.branch:
                     c.url_next += '?branch=%s' % c.branch
             except ChangesetDoesNotExistError:
                 c.url_next = '#'
             #files
             try:
                 c.files_list = c.changeset.get_node(f_path)
                 c.file_history = self._get_history(c.repo, c.files_list, f_path)
             except RepositoryError, e:
                 h.flash(str(e), category='warning')
                 redirect(h.url('files_home', repo_name=repo_name, revision=revision))
         except RepositoryError, e:
             h.flash(str(e), category='warning')
             redirect(h.url('files_home', repo_name=repo_name, revision='tip'))
         return render('files/files.html')
     def rawfile(self, repo_name, revision, f_path):
         hg_model = ScmModel()
         c.repo = hg_model.get_repo(c.repo_name)
         file_node = c.repo.get_changeset(revision).get_node(f_path)
         response.content_type = file_node.mimetype
         response.content_disposition = 'attachment; filename=%s' \
                                                     % f_path.split('/')[-1]
         return file_node.content

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -1593,61 +1593,70 @@ font-family:monospace; @@
 .right .logtags .branchtag {
 background:#FFF url("../images/icons/arrow_branch.png") no-repeat right 6px;
 display:block;
 font-size:0.8em;
 padding:11px 16px 0 0;
+}
 .right .logtags .tagtag {
 background:#FFF url("../images/icons/tag_blue.png") no-repeat right 6px;
 display:block;
 font-size:0.8em;
 padding:11px 16px 0 0;
+}
 div.browserblock {
 overflow:hidden;
 border:1px solid #ccc;
 background:#f8f8f8;
 font-size:100%;
 line-height:125%;
 padding:0;
+}
 div.browserblock .browser-header {
 border-bottom:1px solid #CCC;
 background:#FFF;
 color:blue;
 padding:10px 0;
 float:left;
+}
 div.browserblock .browser-branch {
 background:#FFF;
 padding:20px 0 0 0;
 float:left;
+}
 div.browserblock .browser-branch label {
 color:#4A4A4A;
+}
 div.browserblock .browser-header span {
 margin-left:25px;
 font-weight:700;
+}
 div.browserblock .browser-body {
 background:#EEE;
 border-top:1px solid #CCC;
+}
 table.code-browser {
 border-collapse:collapse;
 width:100%;
+}
 table.code-browser tr {
 margin:3px;
+}
 table.code-browser thead th {
 background-color:#EEE;
 height:20px;
 font-size:1.1em;
 font-weight:700;
 text-align:left;
 padding-left:10px;
+}
 table.code-browser tbody td {
 padding-left:10px;
 height:20px;
+}

rhodecode/templates/files/files_browser.html

➞

Show inline comments

 <%def name="file_class(node)">
 	%if node.is_file():
 		<%return "browser-file" %>
 	%else:
 		<%return "browser-dir"%>
 	%endif
 </%def>
 <div id="body" class="browserblock">
 	<div class="browser-header">
 		${h.form(h.url.current())}
 		<div class="info_box">
           <span >${_('view')}@rev</span>
           <a href="${c.url_prev}" title="${_('previous revision')}">&laquo;</a>
           ${h.text('at_rev',value=c.changeset.revision,size=3)}
           <a href="${c.url_next}" title="${_('next revision')}">&raquo;</a>
           ${h.submit('view','view')}
 	    </div>
 		${h.end_form()}
 	</div>
     <div class="browser-branch">
        ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)}
        <label>${_('follow current branch')}</label>
        <script type="text/javascript">
         YUE.on('stay_at_branch','click',function(e){
         	if(e.target.checked){
         		var uri = "${h.url.current(branch='__BRANCH__')}"
         		uri = uri.replace('__BRANCH__',e.target.value);
         		window.location = uri;
+        	}
         	else{
         		window.location = "${h.url.current()}";
+        	}
         })
        </script>
     </div>
     <div style="clear:both"></div>
 	<div class="browser-body">
 		<table class="code-browser">
 		         <thead>
 		             <tr>
 		                 <th>${_('Name')}</th>
 		                 <th>${_('Size')}</th>
 		                 <th>${_('Mimetype')}</th>
 		                 <th>${_('Revision')}</th>
 		                 <th>${_('Last modified')}</th>
 		                 <th>${_('Last commiter')}</th>
 		             </tr>
 		         </thead>
           		%if c.files_list.parent:
          		<tr class="parity0">
 	          		<td>
 	          			${h.link_to('..',h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.files_list.parent.path),class_="browser-dir")}
 	          		</td>
 	          		<td></td>
 	          		<td></td>
 	          		<td></td>
 	          		<td></td>
 	          		<td></td>
 				</tr>

0 comments (0 inline, 0 general)