added feature that you see p...
|
1 |
<% |
2 |
# API |
|
3 |
my $api = gitprep_api; |
|
4 |
|
|
fix network page
|
5 |
my $user_id = param('user'); |
6 |
my $project_id = param('project'); |
|
7 |
|
|
8 |
my $rep_info = $self->app->rep_info($user_id, $project_id); |
|
9 |
|
|
improved network page
|
10 |
# Branches |
fix network page
|
11 |
my $branches = [map { $_->{name} } @{app->git->branches($rep_info)}]; |
improved network page
|
12 |
|
fix network bug
|
13 |
# Original project id |
14 |
my $original_project_id = app->dbi->model('project')->select( |
|
15 |
'original_project', |
|
remove table __ prefix
|
16 |
where => {'user.id' => $user_id, 'project.id' => $project_id} |
fix network bug
|
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__ => '*'}, |
|
remove table __ prefix
|
25 |
{user => ['id']} |
fix network bug
|
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__ => '*'}, |
|
remove table __ prefix
|
34 |
{user => ['id']} |
fix network bug
|
35 |
], |
remove table __ prefix
|
36 |
where => {'user.id' => $user_id, 'project.id' => $project_id} |
fix network bug
|
37 |
)->one; |
38 |
} |
|
39 |
|
|
added feature that you see p...
|
40 |
# Members |
remove table __ prefix
|
41 |
my $member_projects = app->manager->member_projects($original_project->{'user.id'}, $original_project->{id}); |
fix network bug
|
42 |
unshift @$member_projects, $original_project; |
improved network page
|
43 |
|
44 |
# Members branches |
|
fix network page
|
45 |
for my $member_project (@$member_projects) { |
remove table __ prefix
|
46 |
my $member_rep_info = $self->app->rep_info($member_project->{'user.id'}, $member_project->{id}); |
fix network page
|
47 |
|
48 |
my $branches = app->git->branches($member_rep_info); |
|
49 |
$branches = [map { $_->{name} } @$branches]; |
|
50 | ||
51 |
$member_project->{branches} = $branches; |
|
improved network page
|
52 |
} |
improved desingn
|
53 |
|
54 |
# Default branch |
|
fix network page
|
55 |
my $default_branch = app->manager->default_branch($user_id, $project_id); |
added feature that you see p...
|
56 | |
fix network page
|
57 |
layout 'common', title => "Network \x{30fb} $user_id/$project_id"; |
improve graph page design
|
58 |
%> |
added feature that you see p...
|
59 | |
improved desingn
|
60 |
%= javascript begin |
61 |
$(document).ready(function () { |
|
add pull page design
|
62 |
// Click compare button |
63 |
$('[name=compare-btn]').on('click', function () { |
|
improved network graph page ...
|
64 |
var branch = $('[name=branch]').val(); |
65 |
var remote = $(this).closest('[name=remote]'); |
|
66 |
var remote_member = remote.find('[name=remote-member]').text(); |
|
67 |
var remote_project = remote.find('[name=remote-project]').text(); |
|
68 |
var remote_branch = remote.find('[name=remote-branch]').val(); |
|
69 |
|
|
fix network page
|
70 |
location.href = '<%= url_for("/$user_id/$project_id/network/graph/") %>' + branch + '...' |
improved network graph page ...
|
71 |
+ remote_member + '/' + remote_project + '/' + remote_branch; |
improved desingn
|
72 |
}); |
73 |
}); |
|
74 |
% end |
|
75 |
|
|
added feature that you see p...
|
76 |
%= include '/include/header'; |
improve import-branch page d...
|
77 | |
improve network page design
|
78 |
<div class="container"> |
fix network page
|
79 |
<div class="topic1">Members of the <%= $project_id %> Network</div> |
improve network page design
|
80 |
<div class="network-mybranch"> |
81 |
<span class="network-mybranch-label">My branch</span> |
|
fix network page
|
82 |
<a href="<%= url_for("/$user_id") %>"><%= $user_id %></a> |
improve network page design
|
83 |
<span>/</span> |
fix network page
|
84 |
<a href="<%= url_for("/$user_id/$project_id") %>"><%= $project_id %></a> |
improve network page design
|
85 |
<span>/</span> |
improved desingn
|
86 |
% param('branch', $default_branch); |
fixed branch page bug
|
87 |
%= select_field 'branch' => $branches, style => 'margin-top:5px;width:150px'; |
88 |
</div> |
|
improve network page design
|
89 |
<ul class="network-member-branch"> |
fix network page
|
90 |
% if (@$member_projects) { |
91 |
% for my $member_project (@$member_projects) { |
|
fix network bug
|
92 |
<% |
93 |
my $member_project_id = $member_project->{id}; |
|
remove table __ prefix
|
94 |
my $member_id = $member_project->{'user.id'}; |
fix network bug
|
95 |
my $member_branches = $member_project->{branches}; |
96 |
|
|
97 |
next if $member_id eq $user_id; |
|
98 |
%> |
|
improve network page design
|
99 |
<li name="remote"> |
100 |
<div> |
|
101 |
<span class="network-member-branch-label">Member branch</span> |
|
fix network page
|
102 |
<a name="remote-member" href="<%= url_for("/$member_id") %>"><%= $member_id %></a> |
improved network graph page ...
|
103 |
<span>/</span> |
fix network page
|
104 |
<a name="remote-project" href="<%= url_for("/$member_id/$member_project_id") %>"><%= $member_project_id %></a> |
improved network graph page ...
|
105 |
<span>/</span> |
fix network page
|
106 |
%= select_field 'remote-branch' => $member_branches, style => 'margin-top:5px;margin-bottom:7px;width:150px'; |
improved network graph page ...
|
107 |
</div> |
improve network page design
|
108 |
<div class="last-child"> |
add pull page design
|
109 |
<button name="compare-btn" class="btn" style="margin-top:5px">Compare</button> |
improved network graph page ...
|
110 |
</div> |
improve network page design
|
111 |
</li> |
improved desingn
|
112 |
% } |
improved network graph page ...
|
113 |
% } else { |
improve network page design
|
114 |
<li> |
improved network graph page ...
|
115 |
No Members. |
improve network page design
|
116 |
</li> |
improved network graph page ...
|
117 |
% } |
improve network page design
|
118 |
</ul> |
added feature that you see p...
|
119 |
</div> |
120 |
%= include '/include/footer'; |