@@ -73,46 +73,33 @@

     }

     # Change default branch

-    elsif ($op eq 'default-branch') {

+    elsif ($op eq 'save-settings') {

+      

+      # Parameters

       my $default_branch = param('default-branch');

+      my $private = param('private');

+      my $params = {};

+      if (defined $default_branch) {

+        $params->{default_branch} = $default_branch;

+      }

+      if (defined $private) {

+        $params->{private} = $private ? 1 : 0;

+      };

       my $dbi = app->dbi;

       eval {

         $dbi->model('project')->update(

-          {default_branch => $default_branch},

+          $params,

           where => {user_id => $user, name => $project}

         );

       };

       if (my $e = $@) {

-        app->log->error("/$user/$project/settings?op=default-branch: $e");

+        app->log->error("/$user/$project/settings?op=save-settings: $e");

         $errors = ['Internal Error'];

       }

       else {

-        flash(message => "Default branch is changed to $default_branch.");

-        $self->redirect_to('current');

-        return;

-      }

-    }

-    

-    # Private repository

-    elsif ($op eq 'private') {

-      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 {

-        my $message = 'Private status is saved. Repository is '

-          . ($private ? 'private' : 'public');

-        flash(message => $message);

+        flash(message => "Settings is saved");

         $self->redirect_to('current');

         return;

       }

@@ -148,11 +135,6 @@

       $('#rename').on('click', function () {

         $('#form-rename-project').submit();

       });

-      

-      // Select default branch

-      $('[name=default-branch]').on('change', function () {

-        $('#form-default-branch').submit();

-      });

       // Check matching deleted project

       $('input[name="deleted-project"]').on('keyup', function () {

@@ -227,14 +209,15 @@

           </li>

         </ul>

-        <ul class="project-settings-main">

-          <li>

-            <h4>

-              Settings

-            </h4>

-          </li>

-          <li>

-            <form id="form-default-branch" action="<%= url_for->query(op => 'default-branch') %>" method="post">

+        <form id="form-default-branch" action="<%= url_for %>" method="post">

+          %= hidden_field op => 'save-settings';

+          <ul class="project-settings-main">

+            <li>

+              <h4>

+                Settings

+              </h4>

+            </li>

+            <li>

               Default Branch

               <%

                 my $branches = $git->branches($user, $project);

@@ -244,20 +227,20 @@

                 param('default-branch', $default_branch);

               %>

               %= select_field 'default-branch' => $branch_names;

-            </form>

-          </li>

-          <li>

-            <form id="form-default-branch" action="<%= url_for->query(op => 'private') %>" method="post">

+            </li>

+            <li>

               <span>Make this repository private</span>

               % my $private = app->manager->is_private_project($user, $project);

               % if ($private) {

                 % param('private', 1);

               % }

               %= check_box 'private' => 1;

+            </li>

+            <li>

               <input type="submit" class="btn" value="Save">

-            </form>

-          </li>

-        </ul>

+            </li>

+          </ul>

+        </form>

         <ul class="project-settings-danger">

           <li style="background:red;padding-left:5px">

@@ -162,8 +162,8 @@ note 'Private repository and collaborator';

   $t->content_like(qr/README/);

   # Check private repository

-  $t->post_ok("/kimoto/t1/settings?op=private", form => {private => 1});

-  $t->content_like(qr/Repository is private/);

+  $t->post_ok("/kimoto/t1/settings?op=save-settings", form => {private => 1});

+  $t->content_like(qr/Settings is saved/);

   # Can access private repository from myself

   $t->get_ok(

@@ -365,8 +365,13 @@ note 'Profile';

       system($cmd) == 0 or die "Can't execute git branch";

       $t->get_ok('/kimoto1/t2/settings');

       $t->content_like(qr/b1/);

-      $t->post_ok("/kimoto1/t2/settings?op=default-branch", form => {'default-branch' => 'b1'});

-      $t->content_like(qr/Default branch is changed to b1/);

+      $t->post_ok("/kimoto1/t2/settings?op=save-settings", form => {'default-branch' => 'b1'});

+      $t->content_like(qr/Settings is saved/);

+      my $changed = $t->app->dbi->model('project')->select(

+        'default_branch',

+        where => {user_id => 'kimoto1', name => 't2'}

+      )->value;

+      is($changed, 'b1');

     }

     note 'Delete project';

@@ -552,8 +557,13 @@ note 'Private repository and collaborator';

   $t->content_like(qr/README/);

   # Check private repository

-  $t->post_ok("/kimoto/t1/settings?op=private", form => {private => 1});

-  $t->content_like(qr/Repository is private/);

+  $t->post_ok("/kimoto/t1/settings?op=save-settings", form => {private => 1});

+  $t->content_like(qr/Settings is saved/);

+  my $is_private = $t->app->dbi->model('project')->select(

+    'private',

+    where => {user_id => 'kimoto', name => 't1'}

+  )->value;

+  is($is_private, 1);

   # Can access repository myself

   $t->get_ok("/kimoto/t1");