Changeset - 6fc59ac322ca
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
Marcin Kuzminski - 15 years ago 2010-10-01 00:53:38
marcin@python-works.com
added info about forked repository in few places
added autoloading of parent(forked) for each such repository
5 files changed with 58 insertions and 10 deletions:
pylons_app/model/hg_model.py
4
1
pylons_app/templates/admin/repos/repos.html
27
6
pylons_app/templates/admin/users/user_edit_my_account.html
8
1
pylons_app/templates/index.html
8
1
pylons_app/templates/summary/summary.html
11
1
0 comments (0 inline, 0 general)
pylons_app/model/hg_model.py
➞
Show inline comments
 
@@ -31,6 +31,7 @@ from pylons_app.model import meta
 
from pylons_app.model.db import Repository, User
 
from pylons_app.lib import helpers as h
 
from vcs.exceptions import RepositoryError, VCSError
 
from sqlalchemy.orm import joinedload
 
import logging
 
import os
 
import sys
 
@@ -123,7 +124,9 @@ class HgModel(object):
 
                    dbrepo = None
 
                    if not initial:
 
                        dbrepo = sa.query(Repository)\
 
                            .filter(Repository.repo_name == name).scalar()
 
                            .options(joinedload(Repository.fork))\
 
                            .filter(Repository.repo_name == name)\
 
                            .scalar()
 
 
                    if dbrepo:
 
                        log.info('Adding db instance to cached list')
pylons_app/templates/admin/repos/repos.html
➞
Show inline comments
 
@@ -27,9 +27,11 @@
 
    <div class="table">
 
        <table class="table_disp">
 
        <tr class="header">
 
            <th class="left">${_('name')}</th>
 
            <th class="left">${_('owner')}</th>
 
            <th class="left">${_('last revision')}</th>
 
	        <th class="left">${_('Name')}</th>
 
	        <th class="left">${_('Description')}</th>
 
	        <th class="left">${_('Last change')}</th>
 
	        <th class="left">${_('Tip')}</th>
 
	        <th class="left">${_('Contact')}</th>
 
            <th class="left">${_('action')}</th>
 
        </tr>
 
            %for cnt,repo in enumerate(c.repos_list):
 
@@ -40,9 +42,28 @@
 
                 %else:
 
                    <img alt="${_('public')}" src="/images/icons/lock_open.png"/>
 
                 %endif
 
                ${h.link_to(repo['name'],h.url('edit_repo',repo_name=repo['name']))}</td>
 
                <td>${repo['contact']}</td>
 
                <td>r${repo['rev']}:${repo['tip']}</td>
 
                ${h.link_to(repo['name'],h.url('edit_repo',repo_name=repo['name']))}
 
 
	            %if repo['repo'].dbrepo.fork:
 
	            	<a href="${h.url('summary_home',repo_name=repo['repo'].dbrepo.fork.repo_name)}">
 
	            	<img class="icon" alt="${_('public')}"
 
	            	title="${_('Fork of')} ${repo['repo'].dbrepo.fork.repo_name}"
 
	            	src="/images/icons/arrow_divide.png"/></a>
 
	            %endif
 
                </td>
 
				<td title="${repo['description']}">${h.truncate(repo['description'],60)}</td>
 
	            <td>${h.age(repo['last_change'])}</td>
 
	            <td>
 
	            	%if repo['rev']>=0:
 
	            	${h.link_to('r%s:%s' % (repo['rev'],repo['tip']),
 
	                h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']),
 
	                class_="tooltip",
 
	                tooltip_title=h.tooltip(repo['last_msg']))}
 
	            	%else:
 
	            		${_('No changesets yet')}
 
	            	%endif
 
	            </td>
 
	            <td title="${repo['contact']}">${h.person(repo['contact'])}</td>
 
                <td>
 
                  ${h.form(url('repo', repo_name=repo['name']),method='delete')}
 
                    ${h.submit('remove_%s' % repo['name'],'delete',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
pylons_app/templates/admin/users/user_edit_my_account.html
➞
Show inline comments
 
@@ -98,7 +98,14 @@
 
		                <img class="icon" alt="${_('public')}" src="/images/icons/lock_open.png"/>
 
		             %endif
 
 
		            ${h.link_to(repo.name, h.url('summary_home',repo_name=repo.name))}</td>
 
		            ${h.link_to(repo.name, h.url('summary_home',repo_name=repo.name))}
 
		            %if repo.dbrepo.fork:
 
		            	<a href="${h.url('summary_home',repo_name=repo.dbrepo.fork.repo_name)}">
 
		            	<img class="icon" alt="${_('public')}"
 
		            	title="${_('Fork of')} ${repo.dbrepo.fork.repo_name}"
 
		            	src="/images/icons/arrow_divide.png"/></a>
 
		            %endif
 
		            </td>
 
		            <td>${_('revision')}: ${h.get_changeset_safe(repo,'tip').revision}</td>
 
		            <td>${_('last changed')}: ${h.age(repo.last_change)}</td>
 
		            <td><img class="icon" alt="${_('private')}" src="/images/icons/application_form_edit.png"/> ${h.link_to(_('edit'),h.url('repo_settings_home',repo_name=repo.name))}</td>
pylons_app/templates/index.html
➞
Show inline comments
 
@@ -61,7 +61,14 @@
 
					                <img class="icon" alt="${_('public')}" src="/images/icons/lock_open.png"/>
 
					             %endif
 
					            ${h.link_to(repo['name'],
 
					                h.url('summary_home',repo_name=repo['name']))}</td>
 
					                h.url('summary_home',repo_name=repo['name']))}
 
					            %if repo['repo'].dbrepo.fork:
 
					            	<a href="${h.url('summary_home',repo_name=repo['repo'].dbrepo.fork.repo_name)}">
 
					            	<img class="icon" alt="${_('public')}"
 
					            	title="${_('Fork of')} ${repo['repo'].dbrepo.fork.repo_name}"
 
					            	src="/images/icons/arrow_divide.png"/></a>
 
					            %endif
 
					            </td>
 
					            <td title="${repo['description']}">${h.truncate(repo['description'],60)}</td>
 
					            <td>${h.age(repo['last_change'])}</td>
 
					            <td>
pylons_app/templates/summary/summary.html
➞
Show inline comments
 
@@ -42,7 +42,17 @@ E.onDOMReady(function(e){
 
			      <label>${_('Name')}:</label>
 
			  </div>
 
			  <div class="input-short">
 
			      <span style="font-size: 1.6em;font-weight: bold">${c.repo_info.name}</span>
 
			      <span style="font-size: 1.6em;font-weight: bold;">${c.repo_info.name}</span><br/>
 
		            %if c.repo_info.dbrepo.fork:
 
		            	<span style="margin-top:5px">
 
		            	<a href="${h.url('summary_home',repo_name=c.repo_info.dbrepo.fork.repo_name)}">
 
		            	<img class="icon" alt="${_('public')}"
 
		            	title="${_('Fork of')} ${c.repo_info.dbrepo.fork.repo_name}"
 
		            	src="/images/icons/arrow_divide.png"/>
 
		            	${_('Fork of')} ${c.repo_info.dbrepo.fork.repo_name}
 
		            	</a>
 
		            	</span>
 
		            %endif
 
			  </div>
 
			 </div>
 
0 comments (0 inline, 0 general)
This site is powered by Kallithea 0.7.0, which is © 2010–2025 by various authors & licensed under GPLv3.