| ... | ... |
@@ -10,8 +10,36 @@ |
| 10 | 10 |
# Branches |
| 11 | 11 |
my $branches = [map { $_->{name} } @{app->git->branches($rep_info)}];
|
| 12 | 12 |
|
| 13 |
+ # Original project id |
|
| 14 |
+ my $original_project_id = app->dbi->model('project')->select(
|
|
| 15 |
+ 'original_project', |
|
| 16 |
+ where => {'user.id' => $user_id, 'project.id' => $project_id}
|
|
| 17 |
+ )->value; |
|
| 18 |
+ |
|
| 19 |
+ # Original project |
|
| 20 |
+ my $original_project; |
|
| 21 |
+ if ($original_project_id) {
|
|
| 22 |
+ $original_project = app->dbi->model('project')->select(
|
|
| 23 |
+ [ |
|
| 24 |
+ {__MY__ => '*'},
|
|
| 25 |
+ {user => ['id']}
|
|
| 26 |
+ ], |
|
| 27 |
+ where => {'project.row_id' => $original_project_id}
|
|
| 28 |
+ )->one; |
|
| 29 |
+ } |
|
| 30 |
+ else {
|
|
| 31 |
+ $original_project = app->dbi->model('project')->select(
|
|
| 32 |
+ [ |
|
| 33 |
+ {__MY__ => '*'},
|
|
| 34 |
+ {user => ['id']}
|
|
| 35 |
+ ], |
|
| 36 |
+ where => {'user.id' => $user_id, 'project.id' => $project_id}
|
|
| 37 |
+ )->one; |
|
| 38 |
+ } |
|
| 39 |
+ |
|
| 13 | 40 |
# Members |
| 14 |
- my $member_projects = app->manager->member_projects($user_id, $project_id); |
|
| 41 |
+ my $member_projects = app->manager->member_projects($original_project->{'user.id'}, $original_project->{id});
|
|
| 42 |
+ unshift @$member_projects, $original_project; |
|
| 15 | 43 |
|
| 16 | 44 |
# Members branches |
| 17 | 45 |
for my $member_project (@$member_projects) {
|
| ... | ... |
@@ -73,10 +101,14 @@ |
| 73 | 101 |
<ul class="network-member-branch"> |
| 74 | 102 |
% if (@$member_projects) {
|
| 75 | 103 |
% for my $member_project (@$member_projects) {
|
| 104 |
+ <% |
|
| 105 |
+ my $member_project_id = $member_project->{id};
|
|
| 106 |
+ my $member_id = $member_project->{'user.id'};
|
|
| 107 |
+ my $member_branches = $member_project->{branches};
|
|
| 108 |
+ |
|
| 109 |
+ next if $member_id eq $user_id; |
|
| 110 |
+ %> |
|
| 76 | 111 |
<li name="remote"> |
| 77 |
- % my $member_project_id = $member_project->{id};
|
|
| 78 |
- % my $member_id = $member_project->{'user.id'};
|
|
| 79 |
- % my $member_branches = $member_project->{branches};
|
|
| 80 | 112 |
<div> |
| 81 | 113 |
<span class="network-member-branch-label">Member branch</span> |
| 82 | 114 |
<a name="remote-member" href="<%= url_for("/$member_id") %>"><%= $member_id %></a>
|