complete pull request logic ・ 4d05d4e ・ Gitprep

- complete pull request logic;
- Browse files
- Yuki Kimoto commited on 2016-04-28
- 1 parent 79ddf51
  
  commit 4d05d4ed90958ec108cc19c56e9146e9172ed6ca

Showing 3 changed files with 24 additions and 7 deletions

lib/Gitprep/API.pm

@@ -138,6 +138,14 @@ sub logined_admin {
   return $self->app->manager->is_admin($session_user_id) && $self->logined($session_user_id);
 }
 
+sub session_user_row_id {
+  my $self = shift;
+  
+  my $session_user_row_id = $self->cntl->session('user_row_id');
+  
+  return $session_user_row_id;
+}
+
 sub session_user_id {
   my $self = shift;
   

+5 -4

templates/compare.html.ep

View

@@ -74,6 +74,7 @@
         )->value;
         
         my $new_pull_request_row_id;
+        my $session_user_row_id = $api->session_user_row_id;
         app->dbi->connector->txn(sub {
           # New pull request
           my $new_pull_request_params = {
@@ -84,7 +85,7 @@
             title => $title,
             open => 1,
             open_time => $now_epoch,
-            open_user => $user_row_id
+            open_user => $session_user_row_id
           };
           
           app->dbi->model('pull_request')->insert($new_pull_request_params);
@@ -117,7 +118,7 @@
             message => $message,
             create_time => $now_epoch,
             update_time => $now_epoch,
-            user => $user_row_id
+            user => $session_user_row_id
           };
           
           app->dbi->model('pull_request_message')->insert($new_pull_request_message_params);
@@ -343,7 +344,7 @@
           </button>
           ...
         </div>
-        <div style="display:inline-block">
+        <div style="display:inline-block;margin-top:10px;">
           % if ($base_user_id ne $target_user_id) {
             <button id="head-fork-btn" class="btn btn-small">
               <span>head fork:</span><b> <%= $target_project->{'__user.id'} %>/<%= $target_project->{id} %></b><i class="icon-arrow-down"></i>
@@ -524,7 +525,7 @@
     </div>
   </div>
  
-  % if ($merge_success) {
+  % if (keys %$commits_date && $merge_success) {
     <div class="compare-open-pull-request">
       <form action="<%= url_for %>" method="post">
         <%= hidden_field op => 'create-pull-request' %>

+11 -3

templates/pull.html.ep

View

@@ -46,6 +46,7 @@
   my $taregt_project_id = $target_project->{id};
   
   # Session
+  my $session_user_row_id = $api->session_user_row_id;
   my $session_user_id = $api->session_user_id;
   
   # Base repository information
@@ -72,7 +73,10 @@
     my $op = param('op');
     if ($op eq 'close') {
       app->dbi->model('pull_request')->update(
-        {open => 0},
+        {
+          open => 0,
+          open_user => $session_user_row_id
+        },
         where => {row_id => $row_id}
       );
       $self->redirect_to('current');
@@ -83,7 +87,8 @@
       app->dbi->model('pull_request')->update(
         {
           open => 1,
-          open_time => $open_time
+          open_time => $open_time,
+          open_user => $session_user_row_id
         },
         where => {row_id => $row_id}
       );
@@ -119,7 +124,10 @@
         app->manager->push($work_rep_info, $base_branch);
         
         app->dbi->model('pull_request')->update(
-          {open => 0},
+          {
+            open => 0,
+            open_user => $session_user_row_id
+          },
           where => {row_id => $row_id}
         );
         

...	...	@@ -138,6 +138,14 @@ sub logined_admin {
138	138	return $self->app->manager->is_admin($session_user_id) && $self->logined($session_user_id);
139	139	}
140	140
	141	+sub session_user_row_id {
	142	+ my $self = shift;
	143	+
	144	+ my $session_user_row_id = $self->cntl->session('user_row_id');
	145	+
	146	+ return $session_user_row_id;
	147	+}
	148	+
141	149	sub session_user_id {
142	150	my $self = shift;
143	151

...	...	@@ -74,6 +74,7 @@
74	74	)->value;
75	75
76	76	my $new_pull_request_row_id;
	77	+ my $session_user_row_id = $api->session_user_row_id;
77	78	app->dbi->connector->txn(sub {
78	79	# New pull request
79	80	my $new_pull_request_params = {
...	...	@@ -84,7 +85,7 @@
84	85	title => $title,
85	86	open => 1,
86	87	open_time => $now_epoch,
87		- open_user => $user_row_id
	88	+ open_user => $session_user_row_id
88	89	};
89	90
90	91	app->dbi->model('pull_request')->insert($new_pull_request_params);
...	...	@@ -117,7 +118,7 @@
117	118	message => $message,
118	119	create_time => $now_epoch,
119	120	update_time => $now_epoch,
120		- user => $user_row_id
	121	+ user => $session_user_row_id
121	122	};
122	123
123	124	app->dbi->model('pull_request_message')->insert($new_pull_request_message_params);
...	...	@@ -343,7 +344,7 @@
343	344	</button>
344	345	...
345	346	</div>
346		- <div style="display:inline-block">
	347	+ <div style="display:inline-block;margin-top:10px;">
347	348	% if ($base_user_id ne $target_user_id) {
348	349	<button id="head-fork-btn" class="btn btn-small">
349	350	<span>head fork:</span><b> <%= $target_project->{'__user.id'} %>/<%= $target_project->{id} %></b><i class="icon-arrow-down"></i>
...	...	@@ -524,7 +525,7 @@
524	525	</div>
525	526	</div>
526	527
527		- % if ($merge_success) {
	528	+ % if (keys %$commits_date && $merge_success) {
528	529	<div class="compare-open-pull-request">
529	530	<form action="<%= url_for %>" method="post">
530	531	<%= hidden_field op => 'create-pull-request' %>

...	...	@@ -46,6 +46,7 @@
46	46	my $taregt_project_id = $target_project->{id};
47	47
48	48	# Session
	49	+ my $session_user_row_id = $api->session_user_row_id;
49	50	my $session_user_id = $api->session_user_id;
50	51
51	52	# Base repository information
...	...	@@ -72,7 +73,10 @@
72	73	my $op = param('op');
73	74	if ($op eq 'close') {
74	75	app->dbi->model('pull_request')->update(
75		- {open => 0},
	76	+ {
	77	+ open => 0,
	78	+ open_user => $session_user_row_id
	79	+ },
76	80	where => {row_id => $row_id}
77	81	);
78	82	$self->redirect_to('current');
...	...	@@ -83,7 +87,8 @@
83	87	app->dbi->model('pull_request')->update(
84	88	{
85	89	open => 1,
86		- open_time => $open_time
	90	+ open_time => $open_time,
	91	+ open_user => $session_user_row_id
87	92	},
88	93	where => {row_id => $row_id}
89	94	);
...	...	@@ -119,7 +124,10 @@
119	124	app->manager->push($work_rep_info, $base_branch);
120	125
121	126	app->dbi->model('pull_request')->update(
122		- {open => 0},
	127	+ {
	128	+ open => 0,
	129	+ open_user => $session_user_row_id
	130	+ },
123	131	where => {row_id => $row_id}
124	132	);
125	133