[Fusionforge-commits] r13120 - in branches/Branch_5_1/src: common/include www/project/admin www/register

Roland Mas lolando at fusionforge.org
Thu Apr 14 10:48:49 CEST 2011


Author: lolando
Date: 2011-04-14 10:48:49 +0200 (Thu, 14 Apr 2011)
New Revision: 13120

Modified:
   branches/Branch_5_1/src/common/include/config-vars.php
   branches/Branch_5_1/src/www/project/admin/index.php
   branches/Branch_5_1/src/www/register/index.php
Log:
Removed UI for "public/private" bit for projects, handled by RBAC now [#275]


Modified: branches/Branch_5_1/src/common/include/config-vars.php
===================================================================
--- branches/Branch_5_1/src/common/include/config-vars.php	2011-04-13 20:49:38 UTC (rev 13119)
+++ branches/Branch_5_1/src/common/include/config-vars.php	2011-04-14 08:48:49 UTC (rev 13120)
@@ -146,8 +146,6 @@
 forge_define_config_item ('default_trove_cat', 'core', $GLOBALS['default_trove_cat']) ;
 forge_define_config_item ('user_registration_accept_conditions', 'core', $GLOBALS['sys_require_accept_conditions']);
 forge_set_config_item_bool ('user_registration_accept_conditions', 'core') ;
-forge_define_config_item ('use_private_project', 'core', $GLOBALS['sys_use_private_project']);
-forge_set_config_item_bool ('use_private_project', 'core') ;
 
 // Arch plugin
 if (file_exists ($gfconfig.'plugins/scmarch/config.php')) {

Modified: branches/Branch_5_1/src/www/project/admin/index.php
===================================================================
--- branches/Branch_5_1/src/www/project/admin/index.php	2011-04-13 20:49:38 UTC (rev 13119)
+++ branches/Branch_5_1/src/www/project/admin/index.php	2011-04-14 08:48:49 UTC (rev 13120)
@@ -68,7 +68,6 @@
 	$use_stats = getStringFromRequest('use_stats');
 	$tags = getStringFromRequest('form_tags');
 	$addTags = getArrayFromRequest('addTags');
-	$is_public = getIntFromRequest('is_public');
 	$new_doc_address = getStringFromRequest('new_doc_address');
 	$send_all_docs = getStringFromRequest('send_all_docs');
 	
@@ -98,7 +97,7 @@
 		$use_frs,
 		$use_stats,
 		$tags,
-		$is_public
+		0
 	);
 	
 	//100 $logo_image_id
@@ -201,19 +200,6 @@
 </p>
 
 <?php
-	if (forge_get_config('use_private_project')) {
-		echo '<p>' ;
-		echo _('Visibility: ');
-		echo html_build_select_box_from_arrays(
-               array('0','1'),
-               array(  _('Private'), _('Public') ),
-               'is_public', $group->isPublic(), false);
-	} else {
-		echo "<input type=hidden name=\"is_public\" value=\"1\" />";
-	}
-?>
-
-<?php
 // This function is used to render checkboxes below
 function c($v) {
         if ($v) {

Modified: branches/Branch_5_1/src/www/register/index.php
===================================================================
--- branches/Branch_5_1/src/www/register/index.php	2011-04-13 20:49:38 UTC (rev 13119)
+++ branches/Branch_5_1/src/www/register/index.php	2011-04-14 08:48:49 UTC (rev 13120)
@@ -64,7 +64,6 @@
 	$description = trim(getStringFromRequest('description'));
 	$unix_name = trim(strtolower(getStringFromRequest('unix_name')));
 	$scm = getStringFromRequest('scm');
-	$is_public = getIntFromRequest('is_public');
 	$built_from_template = getIntFromRequest('built_from_template');
 	$feedback = "";
 	$error_msg = "";
@@ -115,7 +114,7 @@
 			$purpose,
 			'shell1',
 			$scm_host,
-			$is_public,
+			0,
 			$send_mail,
 			$built_from_template
 		);
@@ -272,24 +271,6 @@
 	echo '<input type="hidden" name="built_from_template" value="0" />' ;
 	echo '</p>';
 }
-
-if (forge_get_config('use_private_project')) {
-	$index++;
-	echo '<h3>'.$index.'. '._('Visibility'). '</h3>';
-	echo '<p><input type="radio" name="is_public" value="1" ';
-	if (!isset($is_public) || $is_public) {
-		echo 'checked="checked" ';
-	}
-	echo '/>'. _('Public').'</p>';
-
-	echo '<p><input type="radio" name="is_public" value="0" ';
-	if (isset ($is_public) && !$is_public) {
-		echo 'checked="checked"';
-	}
-	echo '/>'. _('Private').'</p> ';
-} else {
-	echo '<input type="hidden" name="is_public" value="1" />';
-}
 ?>
 
 <p style="text-align: center">




More information about the Fusionforge-commits mailing list