Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 104 additions & 0 deletions .basedpyright/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -22133,6 +22133,62 @@
"lineCount": 1
}
},
{
"code": "reportUnknownMemberType",
"range": {
"startColumn": 12,
"endColumn": 22,
"lineCount": 1
}
},
{
"code": "reportUnknownMemberType",
"range": {
"startColumn": 12,
"endColumn": 34,
"lineCount": 1
}
},
{
"code": "reportUnknownMemberType",
"range": {
"startColumn": 45,
"endColumn": 54,
"lineCount": 1
}
},
{
"code": "reportUnknownMemberType",
"range": {
"startColumn": 15,
"endColumn": 25,
"lineCount": 1
}
},
{
"code": "reportUnknownMemberType",
"range": {
"startColumn": 15,
"endColumn": 34,
"lineCount": 1
}
},
{
"code": "reportUnknownMemberType",
"range": {
"startColumn": 8,
"endColumn": 24,
"lineCount": 1
}
},
{
"code": "reportUnknownMemberType",
"range": {
"startColumn": 12,
"endColumn": 33,
"lineCount": 1
}
},
{
"code": "reportUnknownMemberType",
"range": {
Expand Down Expand Up @@ -80970,6 +81026,54 @@
"endColumn": 56,
"lineCount": 1
}
},
{
"code": "reportMissingParameterType",
"range": {
"startColumn": 37,
"endColumn": 48,
"lineCount": 1
}
},
{
"code": "reportMissingParameterType",
"range": {
"startColumn": 55,
"endColumn": 72,
"lineCount": 1
}
},
{
"code": "reportMissingParameterType",
"range": {
"startColumn": 34,
"endColumn": 45,
"lineCount": 1
}
},
{
"code": "reportMissingParameterType",
"range": {
"startColumn": 52,
"endColumn": 59,
"lineCount": 1
}
},
{
"code": "reportMissingParameterType",
"range": {
"startColumn": 28,
"endColumn": 53,
"lineCount": 1
}
},
{
"code": "reportMissingParameterType",
"range": {
"startColumn": 28,
"endColumn": 50,
"lineCount": 1
}
}
],
"./tests/test_views.py": [
Expand Down
12 changes: 12 additions & 0 deletions course/templates/course/git-sha-table.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,16 @@
<td><tt>{{ git_url }}</tt> (<a href="{{token_url}}">{% trans "Manage access tokens" %}</a>)
</td>
</tr>
{% if remote_branches %}
<tr>
<th>{% trans "Branches (click to preview)" %}</th>
<td>
{% for branch in remote_branches %}
<a href="{% url "relate-update_course_from_branch" course.identifier branch %}"
class="btn btn-secondary btn-sm mb-1">
<tt>{{ branch }}</tt> &raquo;</a>
{% endfor %}
</td>
</tr>
{% endif %}
</table>
48 changes: 48 additions & 0 deletions course/templates/course/update-branch.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{% extends "course/course-base.html" %}
{% load i18n %}
{% load crispy_forms_tags %}

{% block title %}
{{ form_description }} - {{ relate_site_name }}
{% endblock %}

{% block content %}
<h1>{{ form_description }}</h1>

<table class="table">
<tr>
<th>{% trans "Branch" %}</th>
<td><tt>{{ branch_name }}</tt></td>
</tr>
<tr>
<th>{% trans "Branch SHA" %}</th>
<td>
{% if branch_sha %}
<tt>{{ branch_sha }}</tt>
{% else %}
{% trans "Not found locally – use 'Fetch and preview' to retrieve it." %}
{% endif %}
</td>
</tr>
</table>

<div class="relate-well">
{% crispy form %}
</div>

{% if modified_flow_ids %}
<div class="relate-well">
<h3>{% trans "Modified flows" %}</h3>
<p>{% trans "The following flows were modified in this branch compared to the currently-live revision. Click a flow to preview it:" %}</p>
<ul>
{% for flow_id in modified_flow_ids %}
<li>
<a href="{% url "relate-view_start_flow" course.identifier flow_id %}">
<tt>{{ flow_id }}</tt>
</a>
</li>
{% endfor %}
</ul>
</div>
{% endif %}
{% endblock %}
Loading
Loading