add private checkbox ・ d1bf532 ・ Gitprep

- add private checkbox;
- Browse files
- Yuki Kimoto commited on 2013-11-16
- 1 parent cbef1b5
  
  commit d1bf5328d0157a34ab948b1c618be63a5c85559f

Showing 3 changed files with 47 additions and 12 deletions

+12 -1

lib/Gitprep/Manager.pm

@@ -89,6 +89,16 @@ sub is_admin {
   return $is_admin;
 }
 
+sub is_private_project {
+  my ($self, $user, $project) = @_;
+  
+  # Is private
+  my $private = $self->app->dbi->model('project')
+    ->select('private', id => [$user, $project])->value;
+  
+  return $private;
+}
+
 sub members {
   my ($self, $user, $project) = @_;
   
@@ -321,7 +331,8 @@ EOS
   my $project_columns = [
     "default_branch not null default 'master'",
     "original_user not null default ''",
-    "original_pid integer not null default 0"
+    "original_pid integer not null default 0",
+    "private not null default 0"
   ];
   for my $column (@$project_columns) {
     eval { $dbi->execute("alter table project add column $column") };

+35 -11

templates/settings.html.ep

View

@@ -1,6 +1,7 @@
 <%
   # API
   my $api = gitprep_api;
+  my $manager = app->manager;
   
   # Parameters
   my $op = param('op') || '';
@@ -39,8 +40,8 @@
       }
       else {
         eval { app->manager->rename_project($user, $project, $to_project) };
-        if ($@) {
-          app->log->error($@);
+        if (my $e = $@) {
+          app->log->error($e);
           $errors = ['Internal Error'];
         }
         else {
@@ -59,8 +60,8 @@
     $description = '' unless defined $description;
     
     eval { $git->description($user, $project, $description) };
-    if ($@) {
-      app->log->error("/$user/$project/settings?op=description: $@");
+    if (my $e = $@) {
+      app->log->error("/$user/$project/settings?op=description: $e");
       $errors = ['Internal Error'];
     }
     else {
@@ -74,8 +75,8 @@
   elsif ($op eq 'default-branch' && $post) {
     my $default_branch = param('default-branch');
     eval { app->manager->default_branch($user, $project, $default_branch) };
-    if ($@) {
-      app->log->error("/$user/$project/settings?op=default-branch: $@");
+    if (my $e = $@) {
+      app->log->error("/$user/$project/settings?op=default-branch: $e");
       $errors = ['Internal Error'];
     }
     else {
@@ -85,6 +86,27 @@
     }
   }
   
+  # Private repository
+  elsif ($op eq 'private' && $post) {
+    my $private = param('private') ? 1 : 0;
+    
+    eval {
+      app->dbi->model('project')->update(
+        {private => $private},
+        id => [$user, $project]
+      );
+    };
+    if (my $e = $@) {
+      app->log->error("/$user/$project/settings?op=private: $e");
+      $errors = ['Internal Error'];
+    }
+    else {
+      flash(message => 'Private status is saved.');
+      $self->redirect_to('current');
+      return;
+    }
+  }
+  
   # Delete project
   elsif ($op eq 'delete-project' && $post) {
     
@@ -92,8 +114,8 @@
     my $project = param('project');
     
     eval { app->manager->delete_project($user, $project) };
-    if ($@) {
-      app->log->error("/$user/$project/settings:$@");
+    if (my $e = $@) {
+      app->log->error("/$user/$project/settings: $e");
       $errors = ['Internal Error'];
     }
     else {
@@ -191,9 +213,11 @@
       <div class="border-gray radius-bottom" style="padding:5px 10px;border-top:none;">
         <form id="form-default-branch" action="<%= url_for->query(op => 'private') %>" method="post" style="margin-bottom:0px">
           <span>Make this repository private</span>
-          %# my $private = $git->description($user, $project);
-          % my $private = 1;
-          %= check_box 'private' => $private, style => 'margin-top:0px;margin-left:5px;margin-right:10px';
+          % my $private = app->manager->is_private_project($user, $project);
+          % if ($private) {
+            % param('private', 1);
+          % }
+          %= check_box 'private' => 1, style => 'margin-top:0px;margin-left:5px;margin-right:10px';
           <input type="submit" class="btn" value="Save">
         </form>
       </div>

BIN

xt/basic.db

View

Binary file not shown.

...	...	@@ -89,6 +89,16 @@ sub is_admin {
89	89	return $is_admin;
90	90	}
91	91
	92	+sub is_private_project {
	93	+ my ($self, $user, $project) = @_;
	94	+
	95	+ # Is private
	96	+ my $private = $self->app->dbi->model('project')
	97	+ ->select('private', id => [$user, $project])->value;
	98	+
	99	+ return $private;
	100	+}
	101	+
92	102	sub members {
93	103	my ($self, $user, $project) = @_;
94	104
...	...	@@ -321,7 +331,8 @@ EOS
321	331	my $project_columns = [
322	332	"default_branch not null default 'master'",
323	333	"original_user not null default ''",
324		- "original_pid integer not null default 0"
	334	+ "original_pid integer not null default 0",
	335	+ "private not null default 0"
325	336	];
326	337	for my $column (@$project_columns) {
327	338	eval { $dbi->execute("alter table project add column $column") };

...	...	@@ -1,6 +1,7 @@
1	1	<%
2	2	# API
3	3	my $api = gitprep_api;
	4	+ my $manager = app->manager;
4	5
5	6	# Parameters
6	7	my $op = param('op') \|\| '';
...	...	@@ -39,8 +40,8 @@
39	40	}
40	41	else {
41	42	eval { app->manager->rename_project($user, $project, $to_project) };
42		- if ($@) {
43		- app->log->error($@);
	43	+ if (my $e = $@) {
	44	+ app->log->error($e);
44	45	$errors = ['Internal Error'];
45	46	}
46	47	else {
...	...	@@ -59,8 +60,8 @@
59	60	$description = '' unless defined $description;
60	61
61	62	eval { $git->description($user, $project, $description) };
62		- if ($@) {
63		- app->log->error("/$user/$project/settings?op=description: $@");
	63	+ if (my $e = $@) {
	64	+ app->log->error("/$user/$project/settings?op=description: $e");
64	65	$errors = ['Internal Error'];
65	66	}
66	67	else {
...	...	@@ -74,8 +75,8 @@
74	75	elsif ($op eq 'default-branch' && $post) {
75	76	my $default_branch = param('default-branch');
76	77	eval { app->manager->default_branch($user, $project, $default_branch) };
77		- if ($@) {
78		- app->log->error("/$user/$project/settings?op=default-branch: $@");
	78	+ if (my $e = $@) {
	79	+ app->log->error("/$user/$project/settings?op=default-branch: $e");
79	80	$errors = ['Internal Error'];
80	81	}
81	82	else {
...	...	@@ -85,6 +86,27 @@
85	86	}
86	87	}
87	88
	89	+ # Private repository
	90	+ elsif ($op eq 'private' && $post) {
	91	+ my $private = param('private') ? 1 : 0;
	92	+
	93	+ eval {
	94	+ app->dbi->model('project')->update(
	95	+ {private => $private},
	96	+ id => [$user, $project]
	97	+ );
	98	+ };
	99	+ if (my $e = $@) {
	100	+ app->log->error("/$user/$project/settings?op=private: $e");
	101	+ $errors = ['Internal Error'];
	102	+ }
	103	+ else {
	104	+ flash(message => 'Private status is saved.');
	105	+ $self->redirect_to('current');
	106	+ return;
	107	+ }
	108	+ }
	109	+
88	110	# Delete project
89	111	elsif ($op eq 'delete-project' && $post) {
90	112
...	...	@@ -92,8 +114,8 @@
92	114	my $project = param('project');
93	115
94	116	eval { app->manager->delete_project($user, $project) };
95		- if ($@) {
96		- app->log->error("/$user/$project/settings:$@");
	117	+ if (my $e = $@) {
	118	+ app->log->error("/$user/$project/settings: $e");
97	119	$errors = ['Internal Error'];
98	120	}
99	121	else {
...	...	@@ -191,9 +213,11 @@
191	213	<div class="border-gray radius-bottom" style="padding:5px 10px;border-top:none;">
192	214	<form id="form-default-branch" action="<%= url_for->query(op => 'private') %>" method="post" style="margin-bottom:0px">
193	215	<span>Make this repository private</span>
194		- %# my $private = $git->description($user, $project);
195		- % my $private = 1;
196		- %= check_box 'private' => $private, style => 'margin-top:0px;margin-left:5px;margin-right:10px';
	216	+ % my $private = app->manager->is_private_project($user, $project);
	217	+ % if ($private) {
	218	+ % param('private', 1);
	219	+ % }
	220	+ %= check_box 'private' => 1, style => 'margin-top:0px;margin-left:5px;margin-right:10px';
197	221	<input type="submit" class="btn" value="Save">
198	222	</form>
199	223	</div>