Accidental refactor, split out legacy.py into separate sumodules and update all call sites.
This commit is contained in:
parent
2109d24483
commit
3efaa255e8
92 changed files with 4458 additions and 4269 deletions
|
@ -1,7 +1,7 @@
|
|||
from app import get_app_url, avatar
|
||||
from data import model
|
||||
from util.names import parse_robot_username
|
||||
from jinja2 import Template, Environment, FileSystemLoader, contextfilter
|
||||
from jinja2 import Environment, FileSystemLoader
|
||||
|
||||
def icon_path(icon_name):
|
||||
return '%s/static/img/icons/%s.png' % (get_app_url(), icon_name)
|
||||
|
@ -14,13 +14,13 @@ def team_reference(teamname):
|
|||
return "<span>%s <b>%s</b></span>" % (avatar_html, teamname)
|
||||
|
||||
def user_reference(username):
|
||||
user = model.get_namespace_user(username)
|
||||
user = model.user.get_namespace_user(username)
|
||||
if not user:
|
||||
return username
|
||||
|
||||
if user.robot:
|
||||
parts = parse_robot_username(username)
|
||||
user = model.get_namespace_user(parts[0])
|
||||
user = model.user.get_namespace_user(parts[0])
|
||||
|
||||
return """<span><img src="%s" alt="Robot"> <b>%s</b></span>""" % (icon_path('wrench'), username)
|
||||
|
||||
|
@ -37,7 +37,7 @@ def user_reference(username):
|
|||
def repository_tag_reference(repository_path_and_tag):
|
||||
(repository_path, tag) = repository_path_and_tag
|
||||
(namespace, repository) = repository_path.split('/')
|
||||
owner = model.get_namespace_user(namespace)
|
||||
owner = model.user.get_namespace_user(namespace)
|
||||
if not owner:
|
||||
return tag
|
||||
|
||||
|
@ -52,7 +52,7 @@ def repository_reference(pair):
|
|||
namespace = pair[0]
|
||||
repository = pair[1]
|
||||
|
||||
owner = model.get_namespace_user(namespace)
|
||||
owner = model.user.get_namespace_user(namespace)
|
||||
if not owner:
|
||||
return "%s/%s" % (namespace, repository)
|
||||
|
||||
|
@ -68,7 +68,7 @@ def repository_reference(pair):
|
|||
|
||||
|
||||
def admin_reference(username):
|
||||
user = model.get_user_or_org(username)
|
||||
user = model.user.get_user_or_org(username)
|
||||
if not user:
|
||||
return 'account settings'
|
||||
|
||||
|
|
Reference in a new issue