| ... | ... |
@@ -590,6 +590,10 @@ ul.issues-label-pallet li {
|
| 590 | 590 |
.pulls-description {
|
| 591 | 591 |
color:#767676; |
| 592 | 592 |
} |
| 593 |
+.compare-pull-request-link {
|
|
| 594 |
+ font-size:20px; |
|
| 595 |
+ margin:20px 0; |
|
| 596 |
+} |
|
| 593 | 597 |
.compare-desc {
|
| 594 | 598 |
color:#767676; |
| 595 | 599 |
margin-bottom:10px; |
| ... | ... |
@@ -37,7 +37,6 @@ |
| 37 | 37 |
$target_project = $base_project |
| 38 | 38 |
} |
| 39 | 39 |
|
| 40 |
-=pod |
|
| 41 | 40 |
# Already pull request exists |
| 42 | 41 |
my $pull_request_already = app->dbi->model('pull_request')->select(
|
| 43 | 42 |
where => {
|
| ... | ... |
@@ -47,25 +46,21 @@ |
| 47 | 46 |
target_branch => $target_branch |
| 48 | 47 |
} |
| 49 | 48 |
)->one; |
| 50 |
- if ($pull_request_already) {
|
|
| 51 |
- my $issue = app->dbi->model('issue')->select(
|
|
| 52 |
- where => {
|
|
| 53 |
- project => $base_project->{row_id},
|
|
| 54 |
- pull_request => $pull_request_already->{row_id}
|
|
| 55 |
- } |
|
| 56 |
- )->one; |
|
| 57 |
- } |
|
| 58 |
-=cut |
|
| 59 | 49 |
|
| 60 | 50 |
# Git |
| 61 | 51 |
my $git = $self->app->git; |
| 62 | 52 |
|
| 63 | 53 |
my $errors; |
| 64 | 54 |
if (lc $self->req->method eq 'post') {
|
| 55 |
+ |
|
| 65 | 56 |
my $op = param('op');
|
| 66 | 57 |
|
| 67 | 58 |
if ($op eq 'create-pull-request') {
|
| 68 | 59 |
|
| 60 |
+ if ($pull_request_already) {
|
|
| 61 |
+ $self->render_exception("Error");
|
|
| 62 |
+ } |
|
| 63 |
+ |
|
| 69 | 64 |
# Parameters |
| 70 | 65 |
my $title = param('title');
|
| 71 | 66 |
my $message = param('message');
|
| ... | ... |
@@ -586,8 +581,23 @@ |
| 586 | 581 |
</div> |
| 587 | 582 |
</div> |
| 588 | 583 |
</div> |
| 589 |
- |
|
| 590 |
- % if (keys %$commits_date && $merge_success) {
|
|
| 584 |
+ |
|
| 585 |
+ % if ($pull_request_already) {
|
|
| 586 |
+ <% |
|
| 587 |
+ my $issue = app->dbi->model('issue')->select(
|
|
| 588 |
+ where => {
|
|
| 589 |
+ project => $base_project->{row_id},
|
|
| 590 |
+ pull_request => $pull_request_already->{row_id}
|
|
| 591 |
+ } |
|
| 592 |
+ )->one; |
|
| 593 |
+ %> |
|
| 594 |
+ |
|
| 595 |
+ <div class="compare-pull-request-link"> |
|
| 596 |
+ <a href="<%= url_for("/$base_user_id/$base_project_id/pull/$issue->{number}") %>">
|
|
| 597 |
+ Pull request #<%= $issue->{number} %>
|
|
| 598 |
+ </a> |
|
| 599 |
+ </div> |
|
| 600 |
+ % } elsif (keys %$commits_date && $merge_success) {
|
|
| 591 | 601 |
<div class="issue-add-comment" style="width:80%"> |
| 592 | 602 |
<form action="<%= url_for %>" method="post"> |
| 593 | 603 |
<%= hidden_field op => 'create-pull-request' %> |