diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala
index 6e7d1c3..4628a36 100644
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -88,6 +88,12 @@
"name" -> trim(label("Repository name", text(required)))
)(ForkRepositoryForm.apply)
+ case class AccountForm(accountName: String)
+
+ val accountForm = mapping(
+ "account" -> trim(label("Group/User name", text(required, validAccountName)))
+ )(AccountForm.apply)
+
/**
* Displays user information.
*/
@@ -354,11 +360,31 @@
get("/:owner/:repository/fork")(readableUsersOnly { repository =>
val loginAccount = context.loginAccount.get
val loginUserName = loginAccount.userName
+ val groups = getGroupsByUserName(loginUserName)
+ groups match {
+ case _: List[String] =>
+ val managerPermissions = groups.map { group =>
+ val members = getGroupMembers(group)
+ context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager })
+ }
+ _root_.helper.html.forkrepository(
+ repository,
+ (groups zip managerPermissions).toMap
+ )
+ case _ => redirect(s"/${loginUserName}")
+ }
+ })
- LockUtil.lock(s"${loginUserName}/${repository.name}"){
- if(repository.owner == loginUserName || getRepository(loginAccount.userName, repository.name, baseUrl).isDefined){
+ post("/:owner/:repository/fork", accountForm)(readableUsersOnly { (form, repository) =>
+ val loginAccount = context.loginAccount.get
+ val loginUserName = loginAccount.userName
+ val accountName = form.accountName
+
+ LockUtil.lock(s"${accountName}/${repository.name}"){
+ if(getRepository(accountName, repository.name, baseUrl).isDefined ||
+ (accountName != loginUserName && !getGroupsByUserName(loginUserName).contains(accountName))){
// redirect to the repository if repository already exists
- redirect(s"/${loginUserName}/${repository.name}")
+ redirect(s"/${accountName}/${repository.name}")
} else {
// Insert to the database at first
val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
@@ -366,7 +392,7 @@
createRepository(
repositoryName = repository.name,
- userName = loginUserName,
+ userName = accountName,
description = repository.repository.description,
isPrivate = repository.repository.isPrivate,
originRepositoryName = Some(originRepositoryName),
@@ -376,22 +402,22 @@
)
// Insert default labels
- insertDefaultLabels(loginUserName, repository.name)
+ insertDefaultLabels(accountName, repository.name)
// clone repository actually
JGitUtil.cloneRepository(
getRepositoryDir(repository.owner, repository.name),
- getRepositoryDir(loginUserName, repository.name))
+ getRepositoryDir(accountName, repository.name))
// Create Wiki repository
JGitUtil.cloneRepository(
getWikiRepositoryDir(repository.owner, repository.name),
- getWikiRepositoryDir(loginUserName, repository.name))
+ getWikiRepositoryDir(accountName, repository.name))
// Record activity
- recordForkActivity(repository.owner, repository.name, loginUserName)
+ recordForkActivity(repository.owner, repository.name, loginUserName, accountName)
// redirect to the repository
- redirect(s"/${loginUserName}/${repository.name}")
+ redirect(s"/${accountName}/${repository.name}")
}
}
})
@@ -431,4 +457,13 @@
case None => Some("Key is invalid.")
}
}
+
+ private def validAccountName: Constraint = new Constraint(){
+ override def validate(name: String, value: String, messages: Messages): Option[String] = {
+ getAccountByUserName(value) match {
+ case Some(_) => None
+ case None => Some("Invalid Group/User Account.")
+ }
+ }
+ }
}
diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala
index 8c83f2c..69e02ea 100644
--- a/src/main/scala/app/RepositoryViewerController.scala
+++ b/src/main/scala/app/RepositoryViewerController.scala
@@ -442,6 +442,10 @@
repo.html.files(revision, repository,
if(path == ".") Nil else path.split("/").toList, // current path
+ context.loginAccount match {
+ case None => List()
+ case account: Option[model.Account] => getGroupsByUserName(account.get.userName)
+ }, // groups of current user
new JGitUtil.CommitInfo(lastModifiedCommit), // last modified commit
files, readme, hasWritePermission(repository.owner, repository.name, context.loginAccount),
flash.get("info"), flash.get("error"))
diff --git a/src/main/scala/service/ActivityService.scala b/src/main/scala/service/ActivityService.scala
index a90bfb5..b1e8202 100644
--- a/src/main/scala/service/ActivityService.scala
+++ b/src/main/scala/service/ActivityService.scala
@@ -160,10 +160,10 @@
None,
currentDate)
- def recordForkActivity(userName: String, repositoryName: String, activityUserName: String)(implicit s: Session): Unit =
+ def recordForkActivity(userName: String, repositoryName: String, activityUserName: String, forkedUserName: String)(implicit s: Session): Unit =
Activities insert Activity(userName, repositoryName, activityUserName,
"fork",
- s"[user:${activityUserName}] forked [repo:${userName}/${repositoryName}] to [repo:${activityUserName}/${repositoryName}]",
+ s"[user:${activityUserName}] forked [repo:${userName}/${repositoryName}] to [repo:${forkedUserName}/${repositoryName}]",
None,
currentDate)
diff --git a/src/main/twirl/helper/forkrepository.scala.html b/src/main/twirl/helper/forkrepository.scala.html
new file mode 100644
index 0000000..e73ce34
--- /dev/null
+++ b/src/main/twirl/helper/forkrepository.scala.html
@@ -0,0 +1,18 @@
+@(repository: service.RepositoryService.RepositoryInfo,
+ groupAndPerm: Map[String, Boolean])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+
+
\ No newline at end of file
diff --git a/src/main/twirl/main.scala.html b/src/main/twirl/main.scala.html
index fa60811..74a955a 100644
--- a/src/main/twirl/main.scala.html
+++ b/src/main/twirl/main.scala.html
@@ -18,6 +18,7 @@
+
@@ -29,6 +30,7 @@
+
', {
+ action: $(this).attr('href'),
+ method: "post"
+ });
+ var account = $('', {
+ type: "hidden",
+ name: "account",
+ value: $(this).data('account')
+ });
+ form.append(account);
+ form.submit();
+ });
+ }
+
@if(settings.ssh && loginAccount.isDefined){
$('#repository-url-http').click(function(){
$('#repository-url-proto').text('HTTP');
diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html
index 96e4a61..f8ff085 100644
--- a/src/main/twirl/repo/files.scala.html
+++ b/src/main/twirl/repo/files.scala.html
@@ -1,6 +1,7 @@
@(branch: String,
repository: service.RepositoryService.RepositoryInfo,
pathList: List[String],
+ groupNames: List[String],
latestCommit: util.JGitUtil.CommitInfo,
files: List[util.JGitUtil.FileInfo],
readme: Option[(List[String], String)],
@@ -10,7 +11,7 @@
@import context._
@import view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
- @html.menu("code", repository, Some(branch), pathList.isEmpty, info, error){
+ @html.menu("code", repository, Some(branch), pathList.isEmpty, groupNames.isEmpty, info, error){
@helper.html.branchcontrol(
branch,
diff --git a/src/main/webapp/assets/vendors/facebox/closelabel.png b/src/main/webapp/assets/vendors/facebox/closelabel.png
new file mode 100644
index 0000000..c339e59
--- /dev/null
+++ b/src/main/webapp/assets/vendors/facebox/closelabel.png
Binary files differ
diff --git a/src/main/webapp/assets/vendors/facebox/facebox.css b/src/main/webapp/assets/vendors/facebox/facebox.css
new file mode 100644
index 0000000..9f4aaa8
--- /dev/null
+++ b/src/main/webapp/assets/vendors/facebox/facebox.css
@@ -0,0 +1,142 @@
+#facebox {
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 100;
+ text-align: left;
+}
+
+
+#facebox .popup{
+ position:relative;
+ border:3px solid rgba(0,0,0,0);
+ -webkit-border-radius:5px;
+ -moz-border-radius:5px;
+ border-radius:5px;
+ -webkit-box-shadow:0 0 18px rgba(0,0,0,0.4);
+ -moz-box-shadow:0 0 18px rgba(0,0,0,0.4);
+ box-shadow:0 0 18px rgba(0,0,0,0.4);
+}
+
+#facebox .content {
+ overflow: hidden;
+ width: 455px;
+ padding: 10px;
+ background: #fff;
+ -webkit-border-radius:4px;
+ -moz-border-radius:4px;
+ border-radius:4px;
+}
+
+#facebox .content > p:first-child{
+ margin-top:0;
+}
+#facebox .content > p:last-child{
+ margin-bottom:0;
+}
+
+#facebox .close{
+ position:absolute;
+ top:5px;
+ right:5px;
+ padding:2px;
+ background:#fff;
+}
+#facebox .close img{
+ opacity:0.3;
+}
+#facebox .close:hover img{
+ opacity:1.0;
+}
+
+#facebox .loading {
+ text-align: center;
+}
+
+#facebox .image {
+ text-align: center;
+}
+
+#facebox img {
+ border: 0;
+ margin: 0;
+}
+
+#facebox_overlay {
+ position: fixed;
+ top: 0px;
+ left: 0px;
+ height:100%;
+ width:100%;
+}
+
+.facebox_hide {
+ z-index:-100;
+}
+
+.facebox_overlayBG {
+ background-color: #000;
+ z-index: 99;
+}
+
+.facebox-header {
+ margin: -15px -15px 15px;
+ padding: 15px;
+ border-bottom: 1px solid #e5e5e5;
+ font-size: 18px;
+ font-weight: normal;
+}
+
+.owner-select-grid {
+ margin-left: -8px;
+ overflow: hidden;
+}
+
+.owner-select-target {
+ float: left;
+ padding: 10px;
+ margin: 0 8px 10px;
+ text-align: center;
+ background-color: #f2f2f2;
+ border-radius: 3px;
+}
+
+.owner-select-target.enabled {
+ font-weight: bold;
+ cursor: pointer;
+}
+
+.owner-select-target.disabled {
+ color: #999;
+ cursor: not-allowed;
+}
+
+.owner-select-grid .avatar {
+ display: block;
+ overflow: hidden;
+ line-height: 1;
+ vertical-align: middle;
+ border-radius: 3px;
+}
+
+.owner-select-target.enabled .avatar {
+ opacity: 1;
+}
+
+.owner-select-target.disabled .avatar {
+ margin-bottom: 9px;
+ opacity: 0.3;
+}
+
+.css-truncate {
+ display: inline-block;
+ max-width: 125px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ vertical-align: top;
+}
+
+.owner-select-target .css-truncate {
+ max-width: 90px;
+}
\ No newline at end of file
diff --git a/src/main/webapp/assets/vendors/facebox/facebox.js b/src/main/webapp/assets/vendors/facebox/facebox.js
new file mode 100644
index 0000000..3b47da7
--- /dev/null
+++ b/src/main/webapp/assets/vendors/facebox/facebox.js
@@ -0,0 +1,313 @@
+/*
+ * Facebox (for jQuery)
+ * version: 1.3
+ * @requires jQuery v1.2 or later
+ * @homepage https://github.com/defunkt/facebox
+ *
+ * Licensed under the MIT:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * Copyright Forever Chris Wanstrath, Kyle Neath
+ *
+ * Usage:
+ *
+ * jQuery(document).ready(function() {
+ * jQuery('a[rel*=facebox]').facebox()
+ * })
+ *
+ *
Terms
+ * Loads the #terms div in the box
+ *
+ *
Terms
+ * Loads the terms.html page in the box
+ *
+ *
Terms
+ * Loads the terms.png image in the box
+ *
+ *
+ * You can also use it programmatically:
+ *
+ * jQuery.facebox('some html')
+ * jQuery.facebox('some html', 'my-groovy-style')
+ *
+ * The above will open a facebox with "some html" as the content.
+ *
+ * jQuery.facebox(function($) {
+ * $.get('blah.html', function(data) { $.facebox(data) })
+ * })
+ *
+ * The above will show a loading screen before the passed function is called,
+ * allowing for a better ajaxy experience.
+ *
+ * The facebox function can also display an ajax page, an image, or the contents of a div:
+ *
+ * jQuery.facebox({ ajax: 'remote.html' })
+ * jQuery.facebox({ ajax: 'remote.html' }, 'my-groovy-style')
+ * jQuery.facebox({ image: 'stairs.jpg' })
+ * jQuery.facebox({ image: 'stairs.jpg' }, 'my-groovy-style')
+ * jQuery.facebox({ div: '#box' })
+ * jQuery.facebox({ div: '#box' }, 'my-groovy-style')
+ *
+ * Want to close the facebox? Trigger the 'close.facebox' document event:
+ *
+ * jQuery(document).trigger('close.facebox')
+ *
+ * Facebox also has a bunch of other hooks:
+ *
+ * loading.facebox
+ * beforeReveal.facebox
+ * reveal.facebox (aliased as 'afterReveal.facebox')
+ * init.facebox
+ * afterClose.facebox
+ *
+ * Simply bind a function to any of these hooks:
+ *
+ * $(document).bind('reveal.facebox', function() { ...stuff to do after the facebox and contents are revealed... })
+ *
+ */
+(function($) {
+ $.facebox = function(data, klass) {
+ $.facebox.loading(data.settings || [])
+
+ if (data.ajax) fillFaceboxFromAjax(data.ajax, klass)
+ else if (data.image) fillFaceboxFromImage(data.image, klass)
+ else if (data.div) fillFaceboxFromHref(data.div, klass)
+ else if ($.isFunction(data)) data.call($)
+ else $.facebox.reveal(data, klass)
+ }
+
+ /*
+ * Public, $.facebox methods
+ */
+
+ $.extend($.facebox, {
+ settings: {
+ opacity : 0.2,
+ overlay : true,
+ loadingImage : '/assets/vendors/facebox/loading.gif',
+ closeImage : '/assets/vendors/facebox/closelabel.png',
+ imageTypes : [ 'png', 'jpg', 'jpeg', 'gif' ],
+ faceboxHtml : '\
+
\
+ \
+
'
+ },
+
+ loading: function() {
+ init()
+ if ($('#facebox .loading').length == 1) return true
+ showOverlay()
+
+ $('#facebox .content').empty().
+ append('

')
+
+ $('#facebox').show().css({
+ top: getPageScroll()[1] + (getPageHeight() / 10),
+ left: $(window).width() / 2 - ($('#facebox .popup').outerWidth() / 2)
+ })
+
+ $(document).bind('keydown.facebox', function(e) {
+ if (e.keyCode == 27) $.facebox.close()
+ return true
+ })
+ $(document).trigger('loading.facebox')
+ },
+
+ reveal: function(data, klass) {
+ $(document).trigger('beforeReveal.facebox')
+ if (klass) $('#facebox .content').addClass(klass)
+ $('#facebox .content').empty().append(data)
+ $('#facebox .popup').children().fadeIn('normal')
+ $('#facebox').css('left', $(window).width() / 2 - ($('#facebox .popup').outerWidth() / 2))
+ $(document).trigger('reveal.facebox').trigger('afterReveal.facebox')
+ },
+
+ close: function() {
+ $(document).trigger('close.facebox')
+ return false
+ }
+ })
+
+ /*
+ * Public, $.fn methods
+ */
+
+ $.fn.facebox = function(settings) {
+ if ($(this).length == 0) return
+
+ init(settings)
+
+ function clickHandler() {
+ $.facebox.loading(true)
+
+ // support for rel="facebox.inline_popup" syntax, to add a class
+ // also supports deprecated "facebox[.inline_popup]" syntax
+ var klass = this.rel.match(/facebox\[?\.(\w+)\]?/)
+ if (klass) klass = klass[1]
+
+ fillFaceboxFromHref(this.href, klass)
+ return false
+ }
+
+ return this.bind('click.facebox', clickHandler)
+ }
+
+ /*
+ * Private methods
+ */
+
+ // called one time to setup facebox on this page
+ function init(settings) {
+ if ($.facebox.settings.inited) return true
+ else $.facebox.settings.inited = true
+
+ $(document).trigger('init.facebox')
+ makeCompatible()
+
+ var imageTypes = $.facebox.settings.imageTypes.join('|')
+ $.facebox.settings.imageTypesRegexp = new RegExp('\\.(' + imageTypes + ')(\\?.*)?$', 'i')
+
+ if (settings) $.extend($.facebox.settings, settings)
+ $('body').append($.facebox.settings.faceboxHtml)
+
+ var preload = [ new Image(), new Image() ]
+ preload[0].src = $.facebox.settings.closeImage
+ preload[1].src = $.facebox.settings.loadingImage
+
+ $('#facebox').find('.b:first, .bl').each(function() {
+ preload.push(new Image())
+ preload.slice(-1).src = $(this).css('background-image').replace(/url\((.+)\)/, '$1')
+ })
+
+ $('#facebox .close')
+ .click($.facebox.close)
+ .append('

')
+ }
+
+ // getPageScroll() by quirksmode.com
+ function getPageScroll() {
+ var xScroll, yScroll;
+ if (self.pageYOffset) {
+ yScroll = self.pageYOffset;
+ xScroll = self.pageXOffset;
+ } else if (document.documentElement && document.documentElement.scrollTop) { // Explorer 6 Strict
+ yScroll = document.documentElement.scrollTop;
+ xScroll = document.documentElement.scrollLeft;
+ } else if (document.body) {// all other Explorers
+ yScroll = document.body.scrollTop;
+ xScroll = document.body.scrollLeft;
+ }
+ return new Array(xScroll,yScroll)
+ }
+
+ // Adapted from getPageSize() by quirksmode.com
+ function getPageHeight() {
+ var windowHeight
+ if (self.innerHeight) { // all except Explorer
+ windowHeight = self.innerHeight;
+ } else if (document.documentElement && document.documentElement.clientHeight) { // Explorer 6 Strict Mode
+ windowHeight = document.documentElement.clientHeight;
+ } else if (document.body) { // other Explorers
+ windowHeight = document.body.clientHeight;
+ }
+ return windowHeight
+ }
+
+ // Backwards compatibility
+ function makeCompatible() {
+ var $s = $.facebox.settings
+
+ $s.loadingImage = $s.loading_image || $s.loadingImage
+ $s.closeImage = $s.close_image || $s.closeImage
+ $s.imageTypes = $s.image_types || $s.imageTypes
+ $s.faceboxHtml = $s.facebox_html || $s.faceboxHtml
+ }
+
+ // Figures out what you want to display and displays it
+ // formats are:
+ // div: #id
+ // image: blah.extension
+ // ajax: anything else
+ function fillFaceboxFromHref(href, klass) {
+ // div
+ if (href.match(/#/)) {
+ var url = window.location.href.split('#')[0]
+ var target = href.replace(url,'')
+ if (target == '#') return
+ $.facebox.reveal($(target).html(), klass)
+
+ // image
+ } else if (href.match($.facebox.settings.imageTypesRegexp)) {
+ fillFaceboxFromImage(href, klass)
+ // ajax
+ } else {
+ fillFaceboxFromAjax(href, klass)
+ }
+ }
+
+ function fillFaceboxFromImage(href, klass) {
+ var image = new Image()
+ image.onload = function() {
+ $.facebox.reveal('

', klass)
+ }
+ image.src = href
+ }
+
+ function fillFaceboxFromAjax(href, klass) {
+ $.facebox.jqxhr = $.get(href, function(data) { $.facebox.reveal(data, klass) })
+ }
+
+ function skipOverlay() {
+ return $.facebox.settings.overlay == false || $.facebox.settings.opacity === null
+ }
+
+ function showOverlay() {
+ if (skipOverlay()) return
+
+ if ($('#facebox_overlay').length == 0)
+ $("body").append('
')
+
+ $('#facebox_overlay').hide().addClass("facebox_overlayBG")
+ .css('opacity', $.facebox.settings.opacity)
+ .click(function() { $(document).trigger('close.facebox') })
+ .fadeIn(200)
+ return false
+ }
+
+ function hideOverlay() {
+ if (skipOverlay()) return
+
+ $('#facebox_overlay').fadeOut(200, function(){
+ $("#facebox_overlay").removeClass("facebox_overlayBG")
+ $("#facebox_overlay").addClass("facebox_hide")
+ $("#facebox_overlay").remove()
+ })
+
+ return false
+ }
+
+ /*
+ * Bindings
+ */
+
+ $(document).bind('close.facebox', function() {
+ if ($.facebox.jqxhr) {
+ $.facebox.jqxhr.abort()
+ $.facebox.jqxhr = null
+ }
+ $(document).unbind('keydown.facebox')
+ $('#facebox').fadeOut(function() {
+ $('#facebox .content').removeClass().addClass('content')
+ $('#facebox .loading').remove()
+ $(document).trigger('afterClose.facebox')
+ })
+ hideOverlay()
+ })
+
+})(jQuery);
diff --git a/src/main/webapp/assets/vendors/facebox/loading.gif b/src/main/webapp/assets/vendors/facebox/loading.gif
new file mode 100644
index 0000000..f864d5f
--- /dev/null
+++ b/src/main/webapp/assets/vendors/facebox/loading.gif
Binary files differ