PR#1527: frontend: fix the monitor page - copr/copr

copr / copr

#1527 frontend: fix the monitor page

Merged 3 years ago by schlupov. Opened 3 years ago by praiskup.

Unknown source fix-monitor-page into master

frontend: fix the monitor page

Pavel Raiskup • 3 years ago

7b14145

frontend/coprs_frontend/coprs/templates/_helpers.html

file modified

+3 -3

		`@@ -469,7 +469,7 @@`
		`{% endmacro %}`


		`- {% macro render_monitor_table(copr, monitor, oses, archs, status_enum_func, simple=True) %}`
		`+ {% macro render_monitor_table(copr, monitor, oses, archs, simple=True) %}`
		`<table class="table table-striped table-bordered">`
		`<thead>`
		`<tr>`
		`@@ -520,10 +520,10 @@`
		`<td>`
		`<a href="{{ copr_url("coprs_ns.copr_build", copr, build_id=row.build_id) }}">`
		`{% if simple %}`
		`- {{ build_state_text(status_enum_func(row.build_chroot_status)) }}`
		`+ {{ build_state_text(row.build_chroot_status\|state_from_num) }}`
		`{% else %}`
		`<small> {{ row.build_id }} </small> <br>`
		`- {{ build_state_text(status_enum_func(row.build_chroot_status)) }}<br>`
		`+ {{ build_state_text(row.build_chroot_status\|state_from_num) }}<br>`
		`<small class="text-muted"> {{ row.build_pkg_version }} </small>`
		`{% endif %}`
		`</a>`

frontend/coprs_frontend/coprs/templates/coprs/detail/monitor/detailed.html

file modified

+1 -1

		`@@ -14,5 +14,5 @@`
		`{% block monitor_simple_selected %}active{% endblock %}`

		`{% block monitor_table %}`
		`- {{ render_monitor_table(copr, monitor, oses, archs, status_enum_func, simple=False) }}`
		`+ {{ render_monitor_table(copr, monitor, oses, archs, simple=False) }}`
		`{% endblock %}`

frontend/coprs_frontend/coprs/templates/coprs/detail/monitor/simple.html

file modified

+1 -1

		`@@ -14,5 +14,5 @@`
		`{% block monitor_simple_selected %}active{% endblock %}`

		`{% block monitor_table %}`
		`- {{ render_monitor_table(copr, monitor, oses, archs, status_enum_func, simple=True) }}`
		`+ {{ render_monitor_table(copr, monitor, oses, archs, simple=True) }}`
		`{% endblock %}`

frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py

file modified

+1 -3

		`@@ -19,7 +19,6 @@`
		`from pygments.lexers import get_lexer_by_name`
		`from pygments.formatters import HtmlFormatter`

		`- from copr_common.enums import StatusEnum`
		`from coprs import app`
		`from coprs import cache`
		`from coprs import db`
		`@@ -1006,8 +1005,7 @@`
		`copr=copr,`
		`monitor=monitor,`
		`oses=oses_grouped,`
		`- archs=archs,`
		`- status_enum_func=StatusEnum)))`
		`+ archs=archs,)))`


		`@coprs_ns.route("/<username>/<coprname>/monitor/")`

praiskup commented 3 years ago

I suppose that 69bc510 somehow broke
it, but passing the status-to-text method down to the templates isn't
good anyway because we already have state_from_num filter.

Fixes: #1523

rebased onto 7b14145

3 years ago