This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 0bace9156368b4f6db202f4c744697efd7ec9fdc (commit)
via 5043c009d0bfed3a8408bfe380dbd2bf62caf704 (commit)
from b2f1dd4996510896f9bad46a405ef86d012a9a8f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0bace9156368b4f6db202f4c744697efd7ec9fdc
commit 0bace9156368b4f6db202f4c744697efd7ec9fdc
Author: Franck Villaume <[email protected]>
Date: Wed May 1 14:52:43 2019 +0200
add support for git cloned urls in /users/<nickname> page. Include fixes
for My Page widget
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index 11e3bf0..d74fbd3 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -934,6 +934,8 @@ control over it to the project's administrator.");
require_once 'common/widget/WidgetLayoutManager.class.php';
if ($params['owner_type'] ==
WidgetLayoutManager::OWNER_TYPE_USER) {
$params['fusionforge_widgets'][] =
'plugin_scmgit_user_myrepositories';
+ } else if ($params['owner_type'] ==
WidgetLayoutManager::OWNER_TYPE_USERHOME) {
+ $params['fusionforge_widgets'][] =
'plugin_scmgit_user_userrepositories';
}
return true;
}
@@ -950,6 +952,9 @@ control over it to the project's administrator.");
if ($params['widget'] == 'plugin_scmgit_user_myrepositories') {
require_once
$gfplugins.$this->name.'/common/scmgit_Widget_MyRepositories.class.php';
$params['instance'] = new
scmgit_Widget_MyRepositories(WidgetLayoutManager::OWNER_TYPE_USER,
$user->getId());
+ } elseif ($params['widget'] ==
'plugin_scmgit_user_userrepositories') {
+ require_once
$gfplugins.$this->name.'/common/scmgit_Widget_UserRepositories.class.php';
+ $params['instance'] = new
scmgit_Widget_UserRepositories(WidgetLayoutManager::OWNER_TYPE_USERHOME,
$user->getId());
}
}
diff --git a/src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php
b/src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php
index a6134b3..7213247 100644
--- a/src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php
+++ b/src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php
@@ -43,14 +43,17 @@ class scmgit_Widget_MyRepositories extends Widget {
function getContent() {
global $HTML;
$user = UserManager::instance()->getCurrentUser();
- $scmgitplugin = plugin_get_object('scmgit');
- $GitRepositories = $this->getMyRepositoriesList($scmgitplugin);
+ $GitRepositories = $this->getMyRepositoriesList();
if (count($GitRepositories)) {
+ $ssh_port = '';
+ if (forge_get_config('ssh_port') != 22) {
+ $ssh_port = ':'.forge_get_config('ssh_port');
+ }
$returnhtml = $HTML->listTableTop();
foreach ($GitRepositories as $GitRepository) {
$project = group_get_object($GitRepository);
$cells = array();
- $cells[][] = '<kbd>git clone
git+ssh://'.$user->getUnixName().'@' . forge_get_config('scm_host') .'/'.
forge_get_config('scm_root', 'scmgit') .'/'. $project->getUnixName()
.'/users/'. $user->getUnixName() .'.git</kbd>';
+ $cells[][] = '<kbd>git clone
git+ssh://'.$user->getUnixName().'@'.$this->getBoxForProject($project).$ssh_port.forge_get_config('repos_path',
'scmgit').'/'.$project->getUnixName() .'/users/'. $user->getUnixName()
.'.git</kbd>';
$cells[][] =
util_make_link('/scm/browser.php?group_id='.$project->getID().'&user_id='.$user->getID(),
_('Browse Git Repository'));
$returnhtml .= $HTML->multiTableRow(array(),
$cells);
}
@@ -61,7 +64,7 @@ class scmgit_Widget_MyRepositories extends Widget {
}
}
- function getMyRepositoriesList($scmgitplugin) {
+ function getMyRepositoriesList() {
$scmgitplugin_id = array_search('scmgit',
PluginManager::instance()->getPlugins());
$returnedArray = array();
$res = db_query_params('SELECT group_id FROM scm_personal_repos
WHERE user_id = $1 AND plugin_id = $2',
diff --git a/src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php
b/src/plugins/scmgit/common/scmgit_Widget_UserRepositories.class.php
similarity index 62%
copy from src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php
copy to src/plugins/scmgit/common/scmgit_Widget_UserRepositories.class.php
index a6134b3..4fd81d2 100644
--- a/src/plugins/scmgit/common/scmgit_Widget_MyRepositories.class.php
+++ b/src/plugins/scmgit/common/scmgit_Widget_UserRepositories.class.php
@@ -1,7 +1,6 @@
<?php
/**
- * Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2019, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -22,9 +21,9 @@
require_once 'common/widget/Widget.class.php';
require_once 'common/widget/WidgetLayoutManager.class.php';
-class scmgit_Widget_MyRepositories extends Widget {
+class scmgit_Widget_UserRepositories extends Widget {
function __construct($owner_type, $owner_id) {
- parent::__construct('plugin_scmgit_user_myrepositories');
+ parent::__construct('plugin_scmgit_user_userrepositories');
$this->setOwner($owner_id, $owner_type);
}
@@ -37,31 +36,36 @@ class scmgit_Widget_MyRepositories extends Widget {
}
function getDescription() {
- return _('Get the list of URLS of your personal Git repository
cloned from projects.');
+ return _('Get the list of URLS of your personal Git repository
cloned from projects, limited to public Git Repositories or shared with
visitors.');
}
function getContent() {
global $HTML;
$user = UserManager::instance()->getCurrentUser();
- $scmgitplugin = plugin_get_object('scmgit');
- $GitRepositories = $this->getMyRepositoriesList($scmgitplugin);
+ $GitRepositories = $this->getMyRepositoriesList();
if (count($GitRepositories)) {
- $returnhtml = $HTML->listTableTop();
+ $ssh_port = '';
+ if (forge_get_config('ssh_port') != 22) {
+ $ssh_port = ':'.forge_get_config('ssh_port');
+ }
+ $returnhtml = null;
foreach ($GitRepositories as $GitRepository) {
$project = group_get_object($GitRepository);
- $cells = array();
- $cells[][] = '<kbd>git clone
git+ssh://'.$user->getUnixName().'@' . forge_get_config('scm_host') .'/'.
forge_get_config('scm_root', 'scmgit') .'/'. $project->getUnixName()
.'/users/'. $user->getUnixName() .'.git</kbd>';
- $cells[][] =
util_make_link('/scm/browser.php?group_id='.$project->getID().'&user_id='.$user->getID(),
_('Browse Git Repository'));
- $returnhtml .= $HTML->multiTableRow(array(),
$cells);
+ if (forge_check_perm('scm', $project->getID(),
'read')) {
+ $cells = array();
+ $cells[][] = '<kbd>git clone
git+ssh://'.$user->getUnixName().'@' .
$this->getBoxForProject($project).$ssh_port.forge_get_config('repos_path',
'scmgit') .'/'. $project->getUnixName() .'/users/'. $user->getUnixName()
.'.git</kbd>';
+ $cells[][] =
util_make_link('/scm/browser.php?group_id='.$project->getID().'&user_id='.$user->getID(),
_('Browse Git Repository'));
+ $returnhtml .=
$HTML->multiTableRow(array(), $cells);
+ }
+ }
+ if ($returnhtml) {
+ return
$HTML->listTableTop().$returnhtml.$HTML->listTableBottom();
}
- $returnhtml .= $HTML->listTableBottom();
- return $returnhtml;
- } else {
- return $HTML->warning_msg(_('No personal git
repository.'));
}
+ return $HTML->warning_msg(_('No personal git repository.'));
}
- function getMyRepositoriesList($scmgitplugin) {
+ function getMyRepositoriesList() {
$scmgitplugin_id = array_search('scmgit',
PluginManager::instance()->getPlugins());
$returnedArray = array();
$res = db_query_params('SELECT group_id FROM scm_personal_repos
WHERE user_id = $1 AND plugin_id = $2',
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=5043c009d0bfed3a8408bfe380dbd2bf62caf704
commit 5043c009d0bfed3a8408bfe380dbd2bf62caf704
Author: Franck Villaume <[email protected]>
Date: Wed May 1 14:51:40 2019 +0200
reorg include
diff --git a/src/common/widget/Widget.class.php
b/src/common/widget/Widget.class.php
index 0ea23df..0e37f1b 100644
--- a/src/common/widget/Widget.class.php
+++ b/src/common/widget/Widget.class.php
@@ -59,6 +59,7 @@ require_once $gfcommon.'widget/Widget_HomeStats.class.php';
require_once $gfcommon.'widget/Widget_HomeTagCloud.class.php';
require_once $gfcommon.'widget/Widget_HomeVersion.class.php';
require_once $gfcommon.'widget/Widget_HomeRss.class.php';
+require_once $gfcommon.'widget/Widget_HomeLatestDiaryNotes.class.php';
// Tracker Widgets
require_once $gfcommon.'widget/Widget_TrackerComment.class.php';
@@ -74,7 +75,6 @@ require_once
$gfcommon.'widget/Widget_UserhomeProjectInformation.class.php';
require_once $gfcommon.'widget/Widget_UserhomePeerRatings.class.php';
require_once $gfcommon.'widget/Widget_UserhomeActivity.class.php';
require_once $gfcommon.'widget/Widget_UserhomeRss.class.php';
-require_once $gfcommon.'widget/Widget_HomeLatestDiaryNotes.class.php';
/**
* FusionForge Layout Widget
-----------------------------------------------------------------------
Summary of changes:
src/common/widget/Widget.class.php | 2 +-
src/plugins/scmgit/common/GitPlugin.class.php | 5 +++
.../common/scmgit_Widget_MyRepositories.class.php | 11 ++++---
...hp => scmgit_Widget_UserRepositories.class.php} | 38 ++++++++++++----------
4 files changed, 34 insertions(+), 22 deletions(-)
copy src/plugins/scmgit/common/{scmgit_Widget_MyRepositories.class.php =>
scmgit_Widget_UserRepositories.class.php} (62%)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
