@@ -209,8 +209,9 @@ sub is_private_project {

   my $user_row_id = $self->api->get_user_row_id($user_id);

   # Is private

-  my $private = $self->app->dbi->model('project')

-    ->select('private', where => {user => $user_row_id, project_id => $project_id})->value;

+  my $private = $self->app->dbi->model('project')->select(

+    'private', where => {user => $user_row_id, id => $project_id}

+  )->value;

   return $private;

 }

@@ -5,10 +5,12 @@

   # Parameters

   my $op = param('op') || '';

-  my $user = param('user') || '';

+  my $user_id = param('user') || '';

+  my $user_row_id = $api->get_user_row_id($user_id);

+  my $project_id = param('project');

   # Authentication

-  unless ($api->logined($user)) {

+  unless ($api->logined($user_id)) {

     $self->redirect_to('/');

     return;

   }

@@ -35,20 +37,20 @@

       elsif (!$vc->check($to_project, 'project_name')) {

         $validation->add_failed('to-project' => 'Repository name contains invalid charactor.');

       }

-      elsif (app->manager->exists_project($user, $to_project)) {

+      elsif (app->manager->exists_project($user_id, $to_project)) {

         $validation->add_failed('to-project' => "$to_project is already exists");

       }

       if ($validation->is_valid) {

         # Rename

-        eval { app->manager->rename_project($user, $project, $to_project) };

+        eval { app->manager->rename_project($user_id, $project_id, $to_project) };

         if (my $e = $@) {

           app->log->error($e);

           $errors = ['Internal Error'];

         }

         else {

           flash(message => "Repository name is renamed to $to_project");

-          $self->redirect_to("/$user/$to_project/settings");

+          $self->redirect_to("/$user_id/$to_project/settings");

           return;

         }

       }

@@ -60,9 +62,9 @@

       my $description = param('description');

       $description = '' unless defined $description;

-      eval { $git->description(app->rep_info($user, $project), $description) };

+      eval { $git->description(app->rep_info($user_id, $project_id), $description) };

       if (my $e = $@) {

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

+        app->log->error("/$user_id/$project_id/settings?op=description: $e");

         $errors = ['Internal Error'];

       }

       else {

@@ -99,12 +101,12 @@

       eval {

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

           $params,

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

+          where => {user => $user_row_id, id => $project_id}

         );

       };

       if (my $e = $@) {

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

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

         $errors = ['Internal Error'];

       }

       else {

@@ -117,17 +119,17 @@

     # Delete project

     elsif ($op eq 'delete-project') {

-      my $user = param('user');

-      my $project = param('project');

+      my $user_id = param('user');

+      my $project_id = param('project');

-      eval { app->manager->delete_project($user, $project) };

+      eval { app->manager->delete_project($user_id, $project_id) };

       if (my $e = $@) {

-        app->log->error("/$user/$project/settings: $e");

+        app->log->error("/$user_id/$project_id/settings: $e");

         $errors = ['Internal Error'];

       }

       else {

-        flash(message => "Repository $project is deleted.");

-        $self->redirect_to("/$user");

+        flash(message => "Repository $project_id is deleted.");

+        $self->redirect_to("/$user_id");

         return;

       }

     }

@@ -148,7 +150,7 @@

       // Check matching deleted project

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

         var deleted_project = $(this).val();

-        var project = "<%= $project %>";

+        var project = "<%= $project_id %>";

         if (deleted_project == project) {

           $('#delete').attr('class', 'btn btn-danger')

@@ -177,7 +179,7 @@

       <div class="left">

         <ul>

           <li><b>Options</b></li>

-          <li><a href="<%= url_for("/$user/$project/settings/collaboration") %>">Collaborators</a></li>

+          <li><a href="<%= url_for("/$user_id/$project_id/settings/collaboration") %>">Collaborators</a></li>

         </ul>

       </div>

       <div class="right">

@@ -191,7 +193,7 @@

           <li>

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

               <div>

-                %= text_field 'to-project' => $project, style => "width:80%";

+                %= text_field 'to-project' => $project_id, style => "width:80%";

                 <a href="#rename-confirm" role="button" class="btn" data-toggle="modal">

                   Rename

                 </a>

@@ -209,7 +211,7 @@

           <li>

             <form action="<%= url_for->query(op => 'change-description') %>" method="post">

               <div>

-                % my $description = $git->description(app->rep_info($user, $project));

+                % my $description = $git->description(app->rep_info($user_id, $project_id));

                 % $description = '' unless defined $description;

                 %= text_field 'description' => $description, style => "width:90%";

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

@@ -229,9 +231,9 @@

             <li id="default-branch">

               Default Branch

               <%

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

+                my $branches = $git->branches($self->app->rep_info($user_id, $project_id));

                 my $branch_names = [map { $_->{name} } @$branches];

-                my $default_branch = app->manager->default_branch($user, $project);

+                my $default_branch = app->manager->default_branch($user_id, $project_id);

                 push @$branch_names, $default_branch unless @$branch_names;

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

               %>

@@ -239,18 +241,16 @@

             </li>

             <li>

               <span>Make this repository private</span>

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

-              % if ($private) {

-                % param('private', 1);

-              % }

+              % my $private = app->manager->is_private_project($user_id, $project_id);

+              % my @private_checked = $private ? (checked => undef) : ();

               %= hidden_field 'private' => 0;

-              %= check_box 'private' => 1;

+              %= check_box 'private' => 1, @private_checked;

             </li>

             <li>

               <%

                 my $ignore_space_change = app->dbi->model('project')->select(

                   'ignore_space_change',

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

+                  where => {user => $user_row_id, id => $project_id}

                 )->value;

                 my @ignore_space_change_checked = $ignore_space_change ? (checked => undef) : ();

               %>

@@ -263,7 +263,7 @@

               <%

                 my $guess_encoding = app->dbi->model('project')->select(

                   'guess_encoding',

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

+                  where => {user => $user_row_id, id => $project_id}

                 )->value;

               %>

               <div>Guess encoding</div>

@@ -291,8 +291,8 @@

               <a style="color:red" href="#delete-confirm" role="button" class="btn" data-toggle="modal">

                 Delete this repository

               </a>

-              %= hidden_field user => $user;

-              %= hidden_field project => $project;

+              %= hidden_field user => $user_id;

+              %= hidden_field project => $project_id;

             </form>

           </li>

         </ul>

@@ -344,11 +344,11 @@

         Unexpected bad things will happen if you don't read this.

       </p>

       <p>

-        This action <b>CANNOT</b> be undone. This will delete the <b><%= "$user/$project" %></b>

+        This action <b>CANNOT</b> be undone. This will delete the <b><%= "$user_id/$project_id" %></b>

         repository, wiki, issues, and comments permanently.

       </p>

       <p>

-        Please type in the name of the repository(<b><%= $project %></b>) to confirm.

+        Please type in the name of the repository(<b><%= $project_id %></b>) to confirm.

       </p>

       %= text_field 'deleted-project';

     </div>