improve branches page open close ・ 93cc1b7 ・ Gitprep

- improve branches page open close;
- Browse files
- Yuki Kimoto commited on 2016-04-23
- 1 parent 552314a
  
  commit 93cc1b7ee288ec99430dbc3c33a02aaa5cbf7443

Showing 3 changed files with 76 additions and 34 deletions

+3 -1

lib/Gitprep.pm

@@ -205,7 +205,9 @@ sub startup {
       table => 'pull_request',
       primary_key => 'row_id',
       join => [
-        'left join user on pull_request.open_user = user.row_id'
+        'left join user on pull_request.open_user = user.row_id',
+        'left join project on pull_request.project = project.row_id',
+        'left join user as project_user on project.user = project_user.row_id'
       ]
     },
     {

+14

public/css/common.css

View

@@ -35,6 +35,20 @@
   box-sizing: border-box;
 }
 
+.branches-open {
+  color:white;
+  background:#6cc644;
+  padding:5px 8px;
+  border-radius:3px;
+  margin-right:4px;
+  border-radius:3px;
+  text-align:center;
+}
+.branches-open:hover {
+  color:white;
+  text-decoration:none;
+}
+
 .pull-comment {
   border:1px solid #eee;
   margin-top:15px;

+59 -33

templates/branches.html.ep

View

@@ -4,8 +4,8 @@
   my $api = gitprep_api;
 
   # Parameters
-  my $user = param('user');
-  my $project = param('project');
+  my $user_id = param('user');
+  my $project_id = param('project');
   my $op = param('op') || '';
   my $display = param('display') || 'overview';
   my $page = param('page') || 1;
@@ -18,7 +18,7 @@
   if ($op eq 'delete' && lc $self->req->method eq 'post') {
     
     # Forbbiden
-    unless ($api->logined($user)) {
+    unless ($api->logined($user_id)) {
       $self->redirect_to('/');
       return;    
     }
@@ -39,7 +39,7 @@
 
     if ($validation->is_valid) {
       # Delete branch
-      eval { $git->delete_branch(app->rep_info($user, $project), $branch) };
+      eval { $git->delete_branch(app->rep_info($user_id, $project_id), $branch) };
       if (my $e = $@) {
         app->log->error(url_with . ": $e");
         $errors = ['Internal Error'];
@@ -54,8 +54,8 @@
   }
   
   # Default branch
-  my $default_branch_name = app->manager->default_branch($user, $project);
-  my $default_branch = $git->branch($self->app->rep_info($user, $project), $default_branch_name);
+  my $default_branch_name = app->manager->default_branch($user_id, $project_id);
+  my $default_branch = $git->branch($self->app->rep_info($user_id, $project_id), $default_branch_name);
   
   # Branches
   my $branch_types;
@@ -70,14 +70,14 @@
   my $page_count = 20;
   my $skip = $page_count * ($page - 1);
   
-  my $branches = $git->branches($self->app->rep_info($user, $project));
+  my $branches = $git->branches($self->app->rep_info($user_id, $project_id));
   my $max = 0;
   my $active_count = 0;
   my $stale_count = 0;
   my $all_count = 0;
   for my $branch (@$branches) {
     $branch->{status} = $git->branch_status(
-      $self->app->rep_info($user, $project),
+      $self->app->rep_info($user_id, $project_id),
       $default_branch->{name},
       $branch->{name}
     );
@@ -147,7 +147,7 @@
   
 %>
 
-% layout 'common', title => "branches  \x{30fb} $user/$project";
+% layout 'common', title => "branches  \x{30fb} $user_id/$project_id";
 
   %= include '/include/header';
   
@@ -159,16 +159,16 @@
     
     <ul class="branches-select">
       <li class="<%= $display eq 'overview' ? 'active' : '' %>">
-        <a href="<%= url_for("/$user/$project/branches") %>">Overview</a>
+        <a href="<%= url_for("/$user_id/$project_id/branches") %>">Overview</a>
       </li>
       <li class="<%= $display eq 'active' ? 'active' : '' %>">
-        <a href="<%= url_for("/$user/$project/branches/active") %>">Active</a>
+        <a href="<%= url_for("/$user_id/$project_id/branches/active") %>">Active</a>
       </li>
       <li class="<%= $display eq 'stale' ? 'active' : '' %>">
-        <a href="<%= url_for("/$user/$project/branches/stale") %>">Stale</a>
+        <a href="<%= url_for("/$user_id/$project_id/branches/stale") %>">Stale</a>
       </li>
       <li class="<%= $display eq 'all' ? 'active' : '' %>">
-        <a href="<%= url_for("/$user/$project/branches/all") %>">All branches</a>
+        <a href="<%= url_for("/$user_id/$project_id/branches/all") %>">All branches</a>
       </li>
     </ul>
     <%
@@ -207,18 +207,27 @@
             % for (my $i = 0; $i < @$branches; $i++) {
               <%
                 my $branch = $branches->[$i];
-                my $bname = $branch->{name};
+                my $branch_name = $branch->{name};
 
                 my $commit_author_email = $branch->{commit}{author_email};
                 my $commit_author_id = app->dbi->model('user')->select(
                   'id',
                   where => {email => $commit_author_email}
                 )->value;
-                
+
+                my $pull_request = app->dbi->model('pull_request')->select(
+                  {__MY__ => ['row_id', 'open']},
+                  where => {
+                    'project.id' => $project_id,
+                    'project_user.id' => $user_id,
+                    branch1 => $default_branch_name,
+                    branch2 => $branch_name
+                  }
+                )->one;
               %>
               % if ($display eq 'overview' && $i > 4) {
                 <li class="branches-overview-more">
-                  <a href="<%= url_for("/$user/$project/branches/$branch_type") %>">
+                  <a href="<%= url_for("/$user_id/$project_id/branches/$branch_type") %>">
                     View more <%= $branch_type %> branches
                   </a>
                 </li>
@@ -229,8 +238,8 @@
                   <ul>
                     <li>
                       <div class="branches-name">
-                        <a href="<%= url_for("/$user/$project/tree/$bname") %>">
-                          <%= $bname %>
+                        <a href="<%= url_for("/$user_id/$project_id/tree/$branch_name") %>">
+                          <%= $branch_name %>
                         </a>
                       </div>
                       <div class="branches-age" title="<%= $branch->{commit}{age_string_datetime_local} %>">
@@ -245,7 +254,7 @@
                       </div>
                     </li>
                     <li class="second-child">
-                      % if ($bname eq $default_branch_name) {
+                      % if ($branch_name eq $default_branch_name) {
                         <div style="padding-left:80px;padding-top:3px">
                           <div class="branches-default">
                             Default
@@ -277,23 +286,40 @@
                       % }
                     </li>
                     <li class="last-child">
-                      % if ($bname eq $default_branch_name) {
-                        % if ($api->logined($user)) {
-                          <a href="<%= url_for("/$user/$project/settings#form-default-branch") %>" type="submit" class="btn btn-small">Change default branch</a>
+                      % if ($branch_name eq $default_branch_name) {
+                        % if ($api->logined($user_id)) {
+                          <a href="<%= url_for("/$user_id/$project_id/settings#form-default-branch") %>" type="submit" class="btn btn-small">Change default branch</a>
                         % }
                       % } else {
-                        <a class="btn btn-small" href="<%= url_for("/$user/$project/compare/$bname")->query(expand => 1) %>">
-                          % if ($api->logined) {
-                            New pull request
+                        % if ($api->logined) {
+                          % if ($pull_request) {
+                            % if ($pull_request->{open}) {
+                              #<%= $pull_request->{row_id} %>
+                              <a class="branches-open" href="<%= url_for("/$user/$project/pull/$pull_request->{row_id}") %>">
+                                open
+                              </a>
+                            % } else {
+                              closed
+                            % }
                           % } else {
+                            <a class="btn btn-small" href="<%= url_for("/$user_id/$project_id/compare/$branch_name")->query(expand => 1) %>">
+                              New pull request
+                            </a>
+                          % }
+                        % } else {
+                          <a class="btn btn-small" href="<%= url_for("/$user_id/$project_id/compare/$branch_name")->query(expand => 1) %>">
                             Compare
+                          </a>
+                        % }
+                        % if ($api->logined($user_id)) {
+                          % if ($pull_request && $pull_request->{open}) {
+                            <button class="btn btn-small disabled delete-branch"value="Delete">Delete</button>
+                          % } else {
+                            <form action="<%= url_for->query(op => 'delete') %>" method="post" style="display:inline-block">
+                              <input type="submit" class="btn btn-small delete-branch" style="color:#900;" value="Delete">
+                              %= hidden_field branch => $branch_name;
+                            </form>
                           % }
-                        </a>
-                        % if ($api->logined($user)) {
-                          <form action="<%= url_for->query(op => 'delete') %>" method="post" style="display:inline-block">
-                            <input type="submit" class="btn btn-small delete-branch" style="color:#900;" value="Delete">
-                            %= hidden_field branch => $bname;
-                          </form>
                         % }
                       % }
                     </li>
@@ -312,7 +338,7 @@
                   % } else {
                     % my $newer_page = $page - 1;
                     <li>
-                      <a href="<%= url_for("/$user/$project/branches/$display?page=$newer_page") %>">Newer</a>
+                      <a href="<%= url_for("/$user_id/$project_id/branches/$display?page=$newer_page") %>">Newer</a>
                     </li>
                   % }
                   % if ($branches_count < $page_count) {
@@ -320,7 +346,7 @@
                   % } else {
                     % my $older_page = $page + 1;
                     <li>
-                      <a href="<%= url_for("/$user/$project/branches/$display?page=$older_page") %>">Older</a>
+                      <a href="<%= url_for("/$user_id/$project_id/branches/$display?page=$older_page") %>">Older</a>
                     </li>
                   % }
                 </ul>

...	...	@@ -205,7 +205,9 @@ sub startup {
205	205	table => 'pull_request',
206	206	primary_key => 'row_id',
207	207	join => [
208		- 'left join user on pull_request.open_user = user.row_id'
	208	+ 'left join user on pull_request.open_user = user.row_id',
	209	+ 'left join project on pull_request.project = project.row_id',
	210	+ 'left join user as project_user on project.user = project_user.row_id'
209	211	]
210	212	},
211	213	{

...	...	@@ -35,6 +35,20 @@
35	35	box-sizing: border-box;
36	36	}
37	37
	38	+.branches-open {
	39	+ color:white;
	40	+ background:#6cc644;
	41	+ padding:5px 8px;
	42	+ border-radius:3px;
	43	+ margin-right:4px;
	44	+ border-radius:3px;
	45	+ text-align:center;
	46	+}
	47	+.branches-open:hover {
	48	+ color:white;
	49	+ text-decoration:none;
	50	+}
	51	+
38	52	.pull-comment {
39	53	border:1px solid #eee;
40	54	margin-top:15px;

...	...	@@ -4,8 +4,8 @@
4	4	my $api = gitprep_api;
5	5
6	6	# Parameters
7		- my $user = param('user');
8		- my $project = param('project');
	7	+ my $user_id = param('user');
	8	+ my $project_id = param('project');
9	9	my $op = param('op') \|\| '';
10	10	my $display = param('display') \|\| 'overview';
11	11	my $page = param('page') \|\| 1;
...	...	@@ -18,7 +18,7 @@
18	18	if ($op eq 'delete' && lc $self->req->method eq 'post') {
19	19
20	20	# Forbbiden
21		- unless ($api->logined($user)) {
	21	+ unless ($api->logined($user_id)) {
22	22	$self->redirect_to('/');
23	23	return;
24	24	}
...	...	@@ -39,7 +39,7 @@
39	39
40	40	if ($validation->is_valid) {
41	41	# Delete branch
42		- eval { $git->delete_branch(app->rep_info($user, $project), $branch) };
	42	+ eval { $git->delete_branch(app->rep_info($user_id, $project_id), $branch) };
43	43	if (my $e = $@) {
44	44	app->log->error(url_with . ": $e");
45	45	$errors = ['Internal Error'];
...	...	@@ -54,8 +54,8 @@
54	54	}
55	55
56	56	# Default branch
57		- my $default_branch_name = app->manager->default_branch($user, $project);
58		- my $default_branch = $git->branch($self->app->rep_info($user, $project), $default_branch_name);
	57	+ my $default_branch_name = app->manager->default_branch($user_id, $project_id);
	58	+ my $default_branch = $git->branch($self->app->rep_info($user_id, $project_id), $default_branch_name);
59	59
60	60	# Branches
61	61	my $branch_types;
...	...	@@ -70,14 +70,14 @@
70	70	my $page_count = 20;
71	71	my $skip = $page_count * ($page - 1);
72	72
73		- my $branches = $git->branches($self->app->rep_info($user, $project));
	73	+ my $branches = $git->branches($self->app->rep_info($user_id, $project_id));
74	74	my $max = 0;
75	75	my $active_count = 0;
76	76	my $stale_count = 0;
77	77	my $all_count = 0;
78	78	for my $branch (@$branches) {
79	79	$branch->{status} = $git->branch_status(
80		- $self->app->rep_info($user, $project),
	80	+ $self->app->rep_info($user_id, $project_id),
81	81	$default_branch->{name},
82	82	$branch->{name}
83	83	);
...	...	@@ -147,7 +147,7 @@
147	147
148	148	%>
149	149
150		-% layout 'common', title => "branches \x{30fb} $user/$project";
	150	+% layout 'common', title => "branches \x{30fb} $user_id/$project_id";
151	151
152	152	%= include '/include/header';
153	153
...	...	@@ -159,16 +159,16 @@
159	159
160	160	<ul class="branches-select">
161	161	<li class="<%= $display eq 'overview' ? 'active' : '' %>">
162		- <a href="<%= url_for("/$user/$project/branches") %>">Overview</a>
	162	+ <a href="<%= url_for("/$user_id/$project_id/branches") %>">Overview</a>
163	163	</li>
164	164	<li class="<%= $display eq 'active' ? 'active' : '' %>">
165		- <a href="<%= url_for("/$user/$project/branches/active") %>">Active</a>
	165	+ <a href="<%= url_for("/$user_id/$project_id/branches/active") %>">Active</a>
166	166	</li>
167	167	<li class="<%= $display eq 'stale' ? 'active' : '' %>">
168		- <a href="<%= url_for("/$user/$project/branches/stale") %>">Stale</a>
	168	+ <a href="<%= url_for("/$user_id/$project_id/branches/stale") %>">Stale</a>
169	169	</li>
170	170	<li class="<%= $display eq 'all' ? 'active' : '' %>">
171		- <a href="<%= url_for("/$user/$project/branches/all") %>">All branches</a>
	171	+ <a href="<%= url_for("/$user_id/$project_id/branches/all") %>">All branches</a>
172	172	</li>
173	173	</ul>
174	174	<%
...	...	@@ -207,18 +207,27 @@
207	207	% for (my $i = 0; $i < @$branches; $i++) {
208	208	<%
209	209	my $branch = $branches->[$i];
210		- my $bname = $branch->{name};
	210	+ my $branch_name = $branch->{name};
211	211
212	212	my $commit_author_email = $branch->{commit}{author_email};
213	213	my $commit_author_id = app->dbi->model('user')->select(
214	214	'id',
215	215	where => {email => $commit_author_email}
216	216	)->value;
217		-
	217	+
	218	+ my $pull_request = app->dbi->model('pull_request')->select(
	219	+ {__MY__ => ['row_id', 'open']},
	220	+ where => {
	221	+ 'project.id' => $project_id,
	222	+ 'project_user.id' => $user_id,
	223	+ branch1 => $default_branch_name,
	224	+ branch2 => $branch_name
	225	+ }
	226	+ )->one;
218	227	%>
219	228	% if ($display eq 'overview' && $i > 4) {
220	229	<li class="branches-overview-more">
221		- <a href="<%= url_for("/$user/$project/branches/$branch_type") %>">
	230	+ <a href="<%= url_for("/$user_id/$project_id/branches/$branch_type") %>">
222	231	View more <%= $branch_type %> branches
223	232	</a>
224	233	</li>
...	...	@@ -229,8 +238,8 @@
229	238	<ul>
230	239	<li>
231	240	<div class="branches-name">
232		- <a href="<%= url_for("/$user/$project/tree/$bname") %>">
233		- <%= $bname %>
	241	+ <a href="<%= url_for("/$user_id/$project_id/tree/$branch_name") %>">
	242	+ <%= $branch_name %>
234	243	</a>
235	244	</div>
236	245	<div class="branches-age" title="<%= $branch->{commit}{age_string_datetime_local} %>">
...	...	@@ -245,7 +254,7 @@
245	254	</div>
246	255	</li>
247	256	<li class="second-child">
248		- % if ($bname eq $default_branch_name) {
	257	+ % if ($branch_name eq $default_branch_name) {
249	258	<div style="padding-left:80px;padding-top:3px">
250	259	<div class="branches-default">
251	260	Default
...	...	@@ -277,23 +286,40 @@
277	286	% }
278	287	</li>
279	288	<li class="last-child">
280		- % if ($bname eq $default_branch_name) {
281		- % if ($api->logined($user)) {
282		- <a href="<%= url_for("/$user/$project/settings#form-default-branch") %>" type="submit" class="btn btn-small">Change default branch</a>
	289	+ % if ($branch_name eq $default_branch_name) {
	290	+ % if ($api->logined($user_id)) {
	291	+ <a href="<%= url_for("/$user_id/$project_id/settings#form-default-branch") %>" type="submit" class="btn btn-small">Change default branch</a>
283	292	% }
284	293	% } else {
285		- <a class="btn btn-small" href="<%= url_for("/$user/$project/compare/$bname")->query(expand => 1) %>">
286		- % if ($api->logined) {
287		- New pull request
	294	+ % if ($api->logined) {
	295	+ % if ($pull_request) {
	296	+ % if ($pull_request->{open}) {
	297	+ #<%= $pull_request->{row_id} %>
	298	+ <a class="branches-open" href="<%= url_for("/$user/$project/pull/$pull_request->{row_id}") %>">
	299	+ open
	300	+ </a>
	301	+ % } else {
	302	+ closed
	303	+ % }
288	304	% } else {
	305	+ <a class="btn btn-small" href="<%= url_for("/$user_id/$project_id/compare/$branch_name")->query(expand => 1) %>">
	306	+ New pull request
	307	+ </a>
	308	+ % }
	309	+ % } else {
	310	+ <a class="btn btn-small" href="<%= url_for("/$user_id/$project_id/compare/$branch_name")->query(expand => 1) %>">
289	311	Compare
	312	+ </a>
	313	+ % }
	314	+ % if ($api->logined($user_id)) {
	315	+ % if ($pull_request && $pull_request->{open}) {
	316	+ <button class="btn btn-small disabled delete-branch"value="Delete">Delete</button>
	317	+ % } else {
	318	+ <form action="<%= url_for->query(op => 'delete') %>" method="post" style="display:inline-block">
	319	+ <input type="submit" class="btn btn-small delete-branch" style="color:#900;" value="Delete">
	320	+ %= hidden_field branch => $branch_name;
	321	+ </form>
290	322	% }
291		- </a>
292		- % if ($api->logined($user)) {
293		- <form action="<%= url_for->query(op => 'delete') %>" method="post" style="display:inline-block">
294		- <input type="submit" class="btn btn-small delete-branch" style="color:#900;" value="Delete">
295		- %= hidden_field branch => $bname;
296		- </form>
297	323	% }
298	324	% }
299	325	</li>
...	...	@@ -312,7 +338,7 @@
312	338	% } else {
313	339	% my $newer_page = $page - 1;
314	340	<li>
315		- <a href="<%= url_for("/$user/$project/branches/$display?page=$newer_page") %>">Newer</a>
	341	+ <a href="<%= url_for("/$user_id/$project_id/branches/$display?page=$newer_page") %>">Newer</a>
316	342	</li>
317	343	% }
318	344	% if ($branches_count < $page_count) {
...	...	@@ -320,7 +346,7 @@
320	346	% } else {
321	347	% my $older_page = $page + 1;
322	348	<li>
323		- <a href="<%= url_for("/$user/$project/branches/$display?page=$older_page") %>">Older</a>
	349	+ <a href="<%= url_for("/$user_id/$project_id/branches/$display?page=$older_page") %>">Older</a>
324	350	</li>
325	351	% }
326	352	</ul>