[Fusionforge-commits] r13990 - in trunk/src/common/docman: actions views

Franck VILLAUME nerville at fusionforge.org
Thu Jul 28 17:49:32 CEST 2011


Author: nerville
Date: 2011-07-28 17:49:32 +0200 (Thu, 28 Jul 2011)
New Revision: 13990

Modified:
   trunk/src/common/docman/actions/addsubdocgroup.php
   trunk/src/common/docman/views/addsubdocgroup.php
Log:
addsubdocgroup: support for plugin projects_hierarchy

Modified: trunk/src/common/docman/actions/addsubdocgroup.php
===================================================================
--- trunk/src/common/docman/actions/addsubdocgroup.php	2011-07-28 15:16:55 UTC (rev 13989)
+++ trunk/src/common/docman/actions/addsubdocgroup.php	2011-07-28 15:49:32 UTC (rev 13990)
@@ -31,20 +31,20 @@
 global $dirid; // id of doc_group
 global $group_id; // id of group
 
+if ($dirid) {
+	$urlredirect = '/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid;
+} else {
+	$urlredirect = '/docman/?group_id='.$group_id;
+}
 $childgroup_id = getIntFromRequest('childgroup_id');
 if ($childgroup_id) {
-	$origin_group_id = $group_id;
-	$group_id = $childgroup_id;
-	$g = group_get_object($group_id);
+	$g = group_get_object($childgroup_id);
+	$urlredirect .= '&childgroup_id='.$childgroup_id;
 }
 
 if (!forge_check_perm('docman', $group_id, 'approve')) {
 	$return_msg = _('Document Manager Action Denied.');
-	if ($dirid) {
-		session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&warning_msg='.urlencode($return_msg));
-	} else {
-		session_redirect('/docman/?group_id='.$group_id.'&warning_msg='.urlencode($return_msg));
-	}
+	session_redirect($urlredirect.'&warning_msg='.urlencode($return_msg));
 }
 
 $groupname = getStringFromRequest('groupname');
@@ -52,16 +52,16 @@
 $dg = new DocumentGroup($g);
 
 if ($dg->isError())
-	session_redirect('/docman/?group_id='.$group_id.'&error_msg='.urlencode($dg->getErrorMessage()));
+	session_redirect($urlredirect.'&error_msg='.urlencode($dg->getErrorMessage()));
 
 if (!$dg->create($groupname, $dirid))
-	session_redirect('/docman/?group_id='.$group_id.'&error_msg='.urlencode($dg->getErrorMessage()));
+	session_redirect($urlredirect.'&error_msg='.urlencode($dg->getErrorMessage()));
 
 if ($dirid) {
 	$return_msg = _('Document subfolder successfully created.');
-	session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dirid.'&feedback='.urlencode($return_msg));
-} else {
-	$return_msg = _('Document folder successfully created.');
-	session_redirect('/docman/?group_id='.$group_id.'&view=listfile&dirid='.$dg->getID().'&feedback='.urlencode($return_msg));
+	session_redirect($urlredirect.'&feedback='.urlencode($return_msg));
 }
+
+$return_msg = _('Document folder successfully created.');
+session_redirect($urlredirect.'&view=listfile&dirid='.$dg->getID().'&feedback='.urlencode($return_msg));
 ?>

Modified: trunk/src/common/docman/views/addsubdocgroup.php
===================================================================
--- trunk/src/common/docman/views/addsubdocgroup.php	2011-07-28 15:16:55 UTC (rev 13989)
+++ trunk/src/common/docman/views/addsubdocgroup.php	2011-07-28 15:49:32 UTC (rev 13990)
@@ -34,6 +34,13 @@
 	session_redirect('/docman/?group_id='.$group_id.'&warning_msg='.urlencode($return_msg));
 }
 
+// plugin projects_hierarchy
+$actionurl = '?group_id='.$group_id.'&action=addsubdocgroup&dirid='.$dirid;
+if ($childgroup_id) {
+	$g = group_get_object($childgroup_id);
+	$actionurl .= '&childgroup_id='.$childgroup_id;
+}
+
 ?>
 <script language="JavaScript" type="text/javascript">/* <![CDATA[ */
 function doItAddSubGroup() {
@@ -43,7 +50,7 @@
 /* ]]> */</script>
 <?php
 echo '<div class="docmanDivIncluded" >';
-echo '<form id="addsubgroup" name="addsubgroup" method="post" action="?group_id='.$group_id.'&action=addsubdocgroup&dirid='.$dirid.'">';
+echo '<form id="addsubgroup" name="addsubgroup" method="post" action="'.$actionurl.'">';
 if ($dirid) {
 	echo _('Name of the document subfolder to create:'). ' ';
 } else {




More information about the Fusionforge-commits mailing list