#4036 Updated build list to include an alert state #5222
Conversation
|
Thanks for the PR! Can you upload an screenshot, please? |
Sure. |
There was a problem hiding this comment.
Thanks for your contribution!
I think this PR is close to get merged. I'd ask for @agjohnson to review it since it includes some CSS but also because he may give you some directions around the warning box.
|
|
||
|
|
||
| @register.simple_tag | ||
| def get_past_time(mins): |
There was a problem hiding this comment.
What about naming this as minutes_ago?
There was a problem hiding this comment.
I was confused about what to call it. Thanks for the suggestion. I will change it as soon as possible.
| @register.simple_tag | ||
| def minutes_ago(mins): | ||
| """Subtracts provided minutes from current time.""" | ||
| return timezone.now() - datetime.timedelta(minutes=int(mins)) |
There was a problem hiding this comment.
We tend to avoid putting logic in templates like this. It should probably be a property defined on the models. A property method like Build.is_stale would be useful outside of templates. We might eventually have to surface this in our API when we make this an API driven page, but for now, the build list page is tied to the database models directly.
There was a problem hiding this comment.
Thanks for the PR! For easier maintenance, we keep logic out of templates and put them on models instead, so this logic can be moved to the Build model. The rest of the PR looks , but I'm sure will change a bit with the move of this logic.
@agjohnson Thanks for your review. I have committed the changes you asked for. Please have a look and let me know if any further changes are required.
| @@ -4,7 +4,7 @@ | |||
| {% for build in build_qs %} | |||
| <li class="module-item col-span"> | |||
| <div id="build-{{ build.id }}"> | |||
| <a href="{{ build.get_absolute_url }}"><span id="build-state">{% if build.state != 'finished' %}{{ build.get_state_display }} {% else %} {% if build.success %}{% trans "Passed" %}{% else %}{% trans "Failed" %}{% endif %}{% endif %}</span> | |||
| <a href="{{ build.get_absolute_url }}">{% if build.is_stale %}<span class="icon-warning" title="{% trans 'This build is still waiting to be built' %}"></span>{% endif %}<span id="build-state">{% if build.state != 'finished' %}{{ build.get_state_display }} {% else %} {% if build.success %}{% trans "Passed" %}{% else %}{% trans "Failed" %}{% endif %}{% endif %}</span> | |||
There was a problem hiding this comment.
@humitos What Do you think about changing {% if build.state != 'finished' %} to {% if build.finished %} as already there is a property method on Build model named Build.finished? as @agjohnson mentioned to avoid logic on templates.
|
Changes look great, I like the test additions! Thanks for the PR and the update! |
Great. its my first contribution to open source! Hope to Continue. |
Woo, congratulations then! Definitely do continue! |
Thanks 👍 |
This commit adds alert icon to build list if the build.state == 'triggered' and build.date > 5 mins ago.
This fixes #4036