From 2f52ed3ee0865e5a5ab2c35dcac3e9eb2253b360 Mon Sep 17 00:00:00 2001 From: takezoe Date: Fri, 26 Jul 2013 10:01:28 +0900 Subject: [PATCH] (refs #2)Fork repository can not be changed repository type. --- src/main/scala/app/RepositorySettingsController.scala | 10 +++++++++- src/main/twirl/settings/options.scala.html | 10 ++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/scala/app/RepositorySettingsController.scala b/src/main/scala/app/RepositorySettingsController.scala index 780a7f303..14c4f9142 100644 --- a/src/main/scala/app/RepositorySettingsController.scala +++ b/src/main/scala/app/RepositorySettingsController.scala @@ -45,7 +45,15 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo * Save the repository options. */ post("/:owner/:repository/settings/options", optionsForm)(ownerOnly { (form, repository) => - saveRepositoryOptions(repository.owner, repository.name, form.description, form.defaultBranch, form.isPrivate) + saveRepositoryOptions( + repository.owner, + repository.name, + form.description, + form.defaultBranch, + repository.repository.parentUserName.map { _ => + repository.repository.isPrivate + } getOrElse form.isPrivate + ) flash += "info" -> "Repository settings has been updated." redirect(s"/${repository.owner}/${repository.name}/settings/options") }) diff --git a/src/main/twirl/settings/options.scala.html b/src/main/twirl/settings/options.scala.html index 8967864bd..59708ce6f 100644 --- a/src/main/twirl/settings/options.scala.html +++ b/src/main/twirl/settings/options.scala.html @@ -25,7 +25,10 @@