... | ... |
@@ -315,13 +315,13 @@ |
315 | 315 |
% } else { |
316 | 316 |
% if ($api->logined) { |
317 | 317 |
% if ($pull_request) { |
318 |
+ #<%= $issue->{number} %> |
|
318 | 319 |
% if ($issue->{open}) { |
319 |
- #<%= $issue->{row_id} %> |
|
320 |
- <a class="branches-open" href="<%= url_for("/$user/$project/pull/$issue->{row_id}") %>"> |
|
320 |
+ <a class="branches-open" href="<%= url_for("/$user/$project/pull/$issue->{number}") %>"> |
|
321 | 321 |
open |
322 | 322 |
</a> |
323 | 323 |
% } else { |
324 |
- <a class="branches-close" href="<%= url_for("/$user/$project/pull/$issue->{row_id}") %>"> |
|
324 |
+ <a class="branches-close" href="<%= url_for("/$user/$project/pull/$issue->{number}") %>"> |
|
325 | 325 |
closed |
326 | 326 |
</a> |
327 | 327 |
% } |
... | ... |
@@ -110,10 +110,7 @@ |
110 | 110 |
{ |
111 | 111 |
open => 0 |
112 | 112 |
}, |
113 |
- where => { |
|
114 |
- 'project.id' => $base_project_id, |
|
115 |
- 'issue.number' => $issue_number |
|
116 |
- } |
|
113 |
+ where => {row_id => $issue->{row_id}} |
|
117 | 114 |
); |
118 | 115 |
$self->redirect_to('current'); |
119 | 116 |
return; |
... | ... |
@@ -127,8 +124,7 @@ |
127 | 124 |
open_user => $session_user_row_id |
128 | 125 |
}, |
129 | 126 |
where => { |
130 |
- 'project.id' => $base_project_id, |
|
131 |
- 'issue.number' => $issue_number |
|
127 |
+ row_id => $issue->{row_id} |
|
132 | 128 |
} |
133 | 129 |
); |
134 | 130 |
$self->redirect_to('current'); |
... | ... |
@@ -165,10 +161,7 @@ |
165 | 161 |
{ |
166 | 162 |
open => 0 |
167 | 163 |
}, |
168 |
- where => { |
|
169 |
- 'project.id' => $base_project_id, |
|
170 |
- 'issue.number' => $issue_number |
|
171 |
- } |
|
164 |
+ where => {row_id => $issue->{row_id}} |
|
172 | 165 |
); |
173 | 166 |
|
174 | 167 |
$self->redirect_to("/$base_user_id/$base_project_id/tree/$base_branch"); |