fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of stigma:platforma
[redakcja.git]
/
project
/
templates
/
manager
/
pull_request.html
diff --git
a/project/templates/manager/pull_request.html
b/project/templates/manager/pull_request.html
index
c2964c2
..
3b19c3b
100644
(file)
--- a/
project/templates/manager/pull_request.html
+++ b/
project/templates/manager/pull_request.html
@@
-54,7
+54,7
@@
<table class="request-report" cellspacing="0">
<tr>
<th>Utwór</th><th>Użytkownik</th><th>Komentarz</th><th>Stan</th>
<table class="request-report" cellspacing="0">
<tr>
<th>Utwór</th><th>Użytkownik</th><th>Komentarz</th><th>Stan</th>
- <th>Akcje</th>
+ <th>
Zgłoszono</th><th>
Akcje</th>
</tr>
{% if objects %}
{% for pullreq in objects %}
</tr>
{% if objects %}
{% for pullreq in objects %}
@@
-63,12
+63,16
@@
<td class="column-user">{{ pullreq.comitter }}</td>
<td class="column-comment">{{ pullreq.comment }}</td>
<td class="column-status"> {{ pullreq.status }}</td>
<td class="column-user">{{ pullreq.comitter }}</td>
<td class="column-comment">{{ pullreq.comment }}</td>
<td class="column-status"> {{ pullreq.status }}</td>
- <td><button type="button" class="accept-button" title="{{pullreq.id}}">Akceptuj</button></td>
+ <td class="column-data">{{ pullreq.timestamp }}</td>
+ <td>
+ <button type="button" class="accept-button" title="{{pullreq.id}}">Akceptuj</button>
+ <a href="{% url editor_view pullreq.document %}?user=$prq-{{pullreq.id}}">Zobacz</a>
+ </td>
</tr>
{% endfor %}
{% else %}
</tr>
{% endfor %}
{% else %}
- <tr><td colspan="
*
">Brak żądań</td></tr>
+ <tr><td colspan="
6
">Brak żądań</td></tr>
{% endif %}
</table>
{% endif %}
</table>