jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

portal: consolidate list templates

Browse source
This commit is contained in:
Iain Learmonth 2022-05-04 13:01:46 +01:00
parent 473152fe19
commit a1aa252bc0
9 changed files with 90 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

41
app/portal/__init__.py
View file

@ -46,7 +46,12 @@ def portal_home():
@portal.route("/groups")
def view_groups():
groups = Group.query.order_by(Group.group_name).all()
return render_template("groups.html.j2", section="group", groups=groups)
return render_template("list.html.j2",
section="group",
title="Groups",
item="group",
items=groups,
new_link=url_for("portal.new_group"))
@portal.route("/group/new", methods=['GET', 'POST'])
@ -154,13 +159,21 @@ def edit_origin(origin_id):
@portal.route("/origins")
def view_origins():
origins = Origin.query.order_by(Origin.domain_name).all()
return render_template("origins.html.j2", section="origin", origins=origins)
return render_template("list.html.j2",
section="origin",
title="Origins",
item="origin",
new_link=url_for("portal.new_origin"),
items=origins)
@portal.route("/proxies")
def view_proxies():
proxies = Proxy.query.filter(Proxy.destroyed == None).order_by(desc(Proxy.updated)).all()
return render_template("proxies.html.j2", section="proxy", proxies=proxies)
return render_template("list.html.j2",
section="proxy",
title="Proxies",
item="proxy",
items=proxies)
@portal.route("/proxy/block/<proxy_id>", methods=['GET', 'POST'])
@ -202,7 +215,12 @@ def view_alarms():
@portal.route('/lists')
def view_mirror_lists():
mirrorlists = MirrorList.query.filter(MirrorList.destroyed == None).all()
return render_template("mirrorlists.html.j2", section="list", mirrorlists=mirrorlists)
return render_template("list.html.j2",
section="list",
title="Mirror Lists",
item="mirror list",
new_link=url_for("portal.new_mirror_list"),
items=mirrorlists)
@portal.route("/list/destroy/<list_id>")
@ -254,7 +272,12 @@ def new_mirror_list(group_id=None):
@portal.route("/bridgeconfs")
def view_bridgeconfs():
bridgeconfs = BridgeConf.query.filter(BridgeConf.destroyed == None).all()
return render_template("bridgeconfs.html.j2", section="bridgeconf", bridgeconfs=bridgeconfs)
return render_template("list.html.j2",
section="bridgeconf",
title="Tor Bridge Configurations",
item="bridge configuration",
items=bridgeconfs,
new_link=url_for("portal.new_bridgeconf"))
@portal.route("/bridgeconf/new", methods=['GET', 'POST'])
@ -301,7 +324,11 @@ def new_bridgeconf(group_id=None):
@portal.route("/bridges")
def view_bridges():
bridges = Bridge.query.filter(Bridge.destroyed == None).all()
return render_template("bridges.html.j2", section="bridge", bridges=bridges)
return render_template("list.html.j2",
section="bridge",
title="Tor Bridges",
item="bridge",
items=bridges)
@portal.route('/bridgeconf/edit/<bridgeconf_id>', methods=['GET', 'POST'])