fnp
/
redakcja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
768d590
)
Poprawienie URLi w manager/pull_request.html.
author
zuber
<marek@stepniowski.com>
Mon, 26 Oct 2009 14:50:57 +0000
(15:50 +0100)
committer
zuber
<marek@stepniowski.com>
Mon, 26 Oct 2009 14:50:57 +0000
(15:50 +0100)
platforma/templates/manager/pull_request.html
patch
|
blob
|
history
diff --git
a/platforma/templates/manager/pull_request.html
b/platforma/templates/manager/pull_request.html
index
9b23551
..
020fcda
100644
(file)
--- a/
platforma/templates/manager/pull_request.html
+++ b/
platforma/templates/manager/pull_request.html
@@
-55,6
+55,7
@@
button.attr('disabled', 'disabled');
var id = parseInt(button.attr('title'));
var docid = $('h2', button.parents('.pull-request')).html();
button.attr('disabled', 'disabled');
var id = parseInt(button.attr('title'));
var docid = $('h2', button.parents('.pull-request')).html();
+ var diffUrl = button.parents('.pull-request').attr('data-diff-url');
var revision = $('.pull-request-revision', button.parents('.pull-request')).html();
$('.diff').slideUp(function() { $(this).remove() });
var revision = $('.pull-request-revision', button.parents('.pull-request')).html();
$('.diff').slideUp(function() { $(this).remove() });
@@
-62,7
+63,7
@@
.hide()
.appendTo($(this).parents('.pull-request'))
.slideDown('slow')
.hide()
.appendTo($(this).parents('.pull-request'))
.slideDown('slow')
- .load(
'/api/documents/' + docid + '/diff
?revision=' + revision, null, function() {
+ .load(
diffUrl + '
?revision=' + revision, null, function() {
button.attr('disabled', null);
});
}
button.attr('disabled', null);
});
}
@@
-75,7
+76,7
@@
{% block maincontent %}
{% if objects %}
{% for pullreq in objects %}
{% block maincontent %}
{% if objects %}
{% for pullreq in objects %}
- <div class="status-{{ pullreq.status }} pull-request" id="request-{{ pullreq.id }}">
+ <div class="status-{{ pullreq.status }} pull-request" id="request-{{ pullreq.id }}"
data-diff-url="{% url diff_resource pullreq.document %}"
>
<h2>{{ pullreq.document }}</h2>
<ul class="request-info">
<li>commiter: {{ pullreq.comitter }}</li>
<h2>{{ pullreq.document }}</h2>
<ul class="request-info">
<li>commiter: {{ pullreq.comitter }}</li>