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 9c23436..3b19c3b 100644 (file)
--- a/project/templates/manager/pull_request.html
+++ b/project/templates/manager/pull_request.html
@@ -11,7 +11,7 @@
             var row = $('#request-' +id);
 
             $.ajax({
             var row = $('#request-' +id);
 
             $.ajax({

-                url: "http://localhost:8000/api/pull-requests/" + id,                
+                url: '{% url pullrequest_list %}/'+id,

                 dataType: 'json',
                 type: 'GET',
                 success: function(data) {
                 dataType: 'json',
                 type: 'GET',
                 success: function(data) {


@@ -35,7 +35,7 @@
             
 
             $.ajax({
             
 
             $.ajax({

-                url: "http://localhost:8000/api/pull-requests/" + id,
+                url: '{% url pullrequest_list %}/'+id,

                 data: {action: 'accept'},
                 dataType: 'json',
                 type: 'PUT',
                 data: {action: 'accept'},
                 dataType: 'json',
                 type: 'PUT',


@@ -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>