[Fusionforge-commits] r12374 - in trunk/src/plugins/mantisbt: controler view www/group

Franck VILLAUME nerville at fusionforge.org
Fri Feb 25 17:02:44 CET 2011


Author: nerville
Date: 2011-02-25 17:02:43 +0100 (Fri, 25 Feb 2011)
New Revision: 12374

Modified:
   trunk/src/plugins/mantisbt/controler/filter.php
   trunk/src/plugins/mantisbt/view/addAttachment.php
   trunk/src/plugins/mantisbt/view/jumpToIssue.php
   trunk/src/plugins/mantisbt/view/viewIssue.php
   trunk/src/plugins/mantisbt/view/viewIssues.php
   trunk/src/plugins/mantisbt/www/group/index.php
Log:
make it work.... numerous fix

Modified: trunk/src/plugins/mantisbt/controler/filter.php
===================================================================
--- trunk/src/plugins/mantisbt/controler/filter.php	2011-02-25 16:00:28 UTC (rev 12373)
+++ trunk/src/plugins/mantisbt/controler/filter.php	2011-02-25 16:02:43 UTC (rev 12374)
@@ -42,7 +42,7 @@
 } else {
 	$bugfilter['dir'] = "DESC";
 }
-echo	'<form name="viewissues" id="mainform" method="post" action="?type='.$type.'&id='.$group_id.'&pluginname='.$mantisbt->name.'" >';
+echo	'<form name="viewissues" id="mainform" method="post" action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'" >';
 if (isset($_POST['sort'])) {
 	echo '<input type="hidden" name="sort" value="'.$_POST['sort'].'" />';
 }

Modified: trunk/src/plugins/mantisbt/view/addAttachment.php
===================================================================
--- trunk/src/plugins/mantisbt/view/addAttachment.php	2011-02-25 16:00:28 UTC (rev 12373)
+++ trunk/src/plugins/mantisbt/view/addAttachment.php	2011-02-25 16:02:43 UTC (rev 12374)
@@ -1,6 +1,8 @@
 <?php
 /*
- * Copyright 2010, Franck Villaume - Capgemini
+ * MantisBT plugin
+ *
+ * Copyright 2010-2011, Franck Villaume - Capgemini
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -20,7 +22,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-echo '<form method="POST" Action="?type='.$type.'&id='.$id.'&pluginname='.$pluginname.'&idBug='.$idBug.'&action=addAttachment&view=viewIssue" enctype="multipart/form-data">';
+global $group_id;
+global $mantisbt;
+global $type;
+global $idBug;
+
+echo '<form method="POST" Action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'&idBug='.$idBug.'&action=addAttachment&view=viewIssue" enctype="multipart/form-data">';
 echo	'<table class="innertabs">';
 echo		'<tr><td>';
 echo		_('File:'). ' '.'<input type="file" name="attachment" />';

Modified: trunk/src/plugins/mantisbt/view/jumpToIssue.php
===================================================================
--- trunk/src/plugins/mantisbt/view/jumpToIssue.php	2011-02-25 16:00:28 UTC (rev 12373)
+++ trunk/src/plugins/mantisbt/view/jumpToIssue.php	2011-02-25 16:02:43 UTC (rev 12374)
@@ -25,7 +25,7 @@
 global $mantisbt;
 
 echo '<div style="width:98%; text-align:right; padding:5px;" >';
-echo '<form name="jump" method="post" action="?type='.$type.'&id='.$group_id.'&pluginname='.$mantisbt->name.'&view=viewIssue">';
+echo '<form name="jump" method="post" action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'&view=viewIssue">';
 echo '<span>'. _('Jump to ticket:'). '</span>';
 echo '<input type="text" name="idBug">';
 echo '<input type="submit" value="Ok" />';

Modified: trunk/src/plugins/mantisbt/view/viewIssue.php
===================================================================
--- trunk/src/plugins/mantisbt/view/viewIssue.php	2011-02-25 16:00:28 UTC (rev 12373)
+++ trunk/src/plugins/mantisbt/view/viewIssue.php	2011-02-25 16:02:43 UTC (rev 12374)
@@ -1,10 +1,10 @@
 <?php
-
 /*
- * Copyright 2010, Capgemini
- * Authors: Franck Villaume - capgemini
- *          Antoine Mercadal - capgemini
+ * MantisBT plugin
  *
+ * Copyright 2010-2011, Franck Villaume - Capgemini
+ * Copyright 2010, Antoine Mercadal - Capgemini
+ *
  * This file is part of FusionForge.
  *
  * FusionForge is free software; you can redistribute it and/or modify
@@ -22,21 +22,25 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
+global $mantisbt;
+global $mantisbtConf;
+global $user;
+global $password;
+
 if (!isset($defect)) {
 	try {
         /* do not recreate $clientSOAP object if already created by other pages */
         if (!isset($clientSOAP))
-		    $clientSOAP = new SoapClient("http://".forge_get_config('server','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
+		    $clientSOAP = new SoapClient($mantisbtConf['url']."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
 
 		$defect = $clientSOAP->__soapCall('mc_issue_get', array("username" => $username, "password" => $password, "issue_id" => $idBug));
 	} catch (SoapFault $soapFault) {
-		$msg = $soapFault->faultstring;
+		echo '<div class="warning" >'. _('Technical error occurs during data retrieving:'). ' ' .$soapFault->faultstring.'</div>';
 		$errorPage = true;
 	}
 }
-if ($errorPage){
-	echo 	'<div class="warning" >Un problème est survenu lors de la récupération des données : Ticket '.$idBug.' : <i>'.$msg.'</i></div>';
-} else {
+
+if (!$errorPage){
     include('jumpToIssue.php');
     echo "<h2 style='border-bottom: 1px solid black'>Détail du ticket #$idBug</h2>";
 	echo	'<table class="innertabs">';
@@ -95,9 +99,9 @@
 ?>
 <style>
 .notice_title {
-    background-color: #D7E0EB; 
-    padding: 10px; 
-    font-weight: bold; 
+    background-color: #D7E0EB;
+    padding: 10px;
+    font-weight: bold;
     margin-bottom:0px;
     cursor: pointer;
     color: #4F93C3;
@@ -105,10 +109,10 @@
 
 .notice_content {
     border: 1px solid #D7E0EB;
-    padding: 10px; 
-    font-weight: bold; 
-    -moz-border-radius-bottomright: 8px; 
-    -moz-border-radius-bottomleft: 8px; 
+    padding: 10px;
+    font-weight: bold;
+    -moz-border-radius-bottomright: 8px;
+    -moz-border-radius-bottomleft: 8px;
     -webkit-border-bottom-right-radius: 8px;
     -webkit-border-bottom-left-radius: 8px;
     margin-top:0px;
@@ -117,7 +121,7 @@
 <script type="text/javascript">
     $(document).ready(function() {
         $("#expandable_edition").hide();
-    });    
+    });
 
 </script>
 <p class="notice_title" onclick='$("#expandable_edition").slideToggle(300)'>Editer le ticket</p>

Modified: trunk/src/plugins/mantisbt/view/viewIssues.php
===================================================================
--- trunk/src/plugins/mantisbt/view/viewIssues.php	2011-02-25 16:00:28 UTC (rev 12373)
+++ trunk/src/plugins/mantisbt/view/viewIssues.php	2011-02-25 16:02:43 UTC (rev 12374)
@@ -79,7 +79,7 @@
 <script type="text/javascript">
 	$(document).ready(function() {
 	<?php
-		if ( !isset($_POST["projectStatus"]) && !isset($_POST["projectChildId"]) && !isset($_POST["projectFixers"]) && !isset($_POST["projectReporters"]))
+		if (!isset($_POST["projectStatus"]) && !isset($_POST["projectChildId"]) && !isset($_POST["projectFixers"]) && !isset($_POST["projectReporters"]))
 		{
 	?>
 		jQuery("#expandable_filter").hide();
@@ -160,7 +160,7 @@
 		echo	'<tr>';
 		// Priority
 		echo		'<th class="InText" width="2%">';
-		echo			'<form name="filterprority" method="post" action="?type='.$type.'&id='.$group_id.'&pluginname='.$mantisbt->name.'">';
+		echo			'<form name="filterprority" method="post" action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'">';
 		if ($bugfilter['sort'] == "priority" && $bugfilter['dir'] == "ASC") {
 			echo			'<input type=hidden name="dir" value="DESC"/>';
 		} else if ($bugfilter['sort'] == "priority" && $bugfilter['dir'] == "DESC") {
@@ -188,7 +188,7 @@
 		echo 		'</th>';
 		// ID
 		echo		'<th class="InText" width="3%">';
-		echo			'<form name="filterid" method="post" action="?type='.$type.'&id='.$group_id.'&pluginname='.$mantisbt->name.'">';
+		echo			'<form name="filterid" method="post" action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'">';
 		if ($bugfilter['sort'] == "id" && $bugfilter['dir'] == "ASC") {
 			echo			'<input type=hidden name="dir" value="DESC"/>';
 		} else if ($bugfilter['sort'] == "id" && $bugfilter['dir'] == "DESC") {
@@ -216,7 +216,7 @@
 		echo 		'</th>';
 		// Catégorie
 		echo		'<th class="InText" width="7%">';
-		echo			'<form name="filtercat" method="post" action="?type='.$type.'&id='.$group_id.'&pluginname='.$mantisbt->name.'">';
+		echo			'<form name="filtercat" method="post" action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'">';
 		if ($bugfilter['sort'] == "category_id" && $bugfilter['dir'] == "ASC") {
 			echo			'<input type=hidden name="dir" value="DESC"/>';
 		}else if ($bugfilter['sort'] == "category_id" && $bugfilter['dir'] == "DESC") {
@@ -244,7 +244,7 @@
 		echo 		'</th>';
 		// Projet
 		echo 		'<th class="InText" width="7%">';
-		echo			'<form name="projectid" method="post" action="?type='.$type.'&id='.$group_id.'&pluginname='.$mantisbt->name.'">';
+		echo			'<form name="projectid" method="post" action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'">';
 		if ($bugfilter['sort'] == "project_id" && $bugfilter['dir'] == "ASC") {
 			echo			'<input type=hidden name="dir" value="DESC"/>';
 		}else if ($bugfilter['sort'] == "project_id" && $bugfilter['dir'] == "DESC") {
@@ -272,7 +272,7 @@
 		echo 		'</th>';
 		// Sévérité
 		echo 		'<th class="InText" width="7%">';
-		echo			'<form name="severity" method="post" action="?type='.$type.'&id='.$group_id.'&pluginname='.$mantisbt->name.'">';
+		echo			'<form name="severity" method="post" action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'">';
 		if ($bugfilter['sort'] == "severity" && $bugfilter['dir'] == "ASC") {
 			echo			'<input type=hidden name="dir" value="DESC"/>';
 		}else if ($bugfilter['sort'] == "severity" && $bugfilter['dir'] == "DESC") {
@@ -300,7 +300,7 @@
 		echo 		'</th>';
 		// Etat
 		echo 		'<th class="InText" width="15%">';
-		echo			'<form name="statusid" method="post" action="?type='.$type.'&id='.$group_id.'&pluginname='.$mantisbt->name.'">';
+		echo			'<form name="statusid" method="post" action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'">';
 		if ($bugfilter['sort'] == "status" && $bugfilter['dir'] == "ASC") {
 			echo			'<input type=hidden name="dir" value="DESC"/>';
 		}else if ($bugfilter['sort'] == "status" && $bugfilter['dir'] == "DESC") {
@@ -328,7 +328,7 @@
 		echo 		'</th>';
 		// Mis a jour (date)
 		echo 		'<th class="InText" width="7%">';
-		echo			'<form name="lastupdate" method="post" action="?type='.$type.'&id='.$group_id.'&pluginname='.$mantisbt->name.'">';
+		echo			'<form name="lastupdate" method="post" action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'">';
 		if ($bugfilter['sort'] == "last_updated" && $bugfilter['dir'] == "ASC") {
 			echo			'<input type=hidden name="dir" value="DESC"/>';
 		}else if ($bugfilter['sort'] == "last_updated" && $bugfilter['dir'] == "DESC") {
@@ -356,7 +356,7 @@
 		echo 		'</th>';
 		// résumé
 		echo 		'<th class="InText" width="29%">';
-		echo			'<form name="summary" method="post" action="?type='.$type.'&id='.$group_id.'&pluginname='.$mantisbt->name.'">';
+		echo			'<form name="summary" method="post" action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'">';
 		if ($bugfilter['sort'] == "summary" && $bugfilter['dir'] == "ASC") {
 			echo			'<input type=hidden name="dir" value="DESC"/>';
 		}else if ($bugfilter['sort'] == "summary" && $bugfilter['dir'] == "DESC") {
@@ -384,7 +384,7 @@
 		echo 		'</th>';
 		// version de détection
 		echo 		'<th class="InText" width="6%">';
-		echo			'<form name="version" method="post" action="?type='.$type.'&id='.$group_id.'&pluginname='.$mantisbt->name.'">';
+		echo			'<form name="version" method="post" action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'">';
 		if ($bugfilter['sort'] == "version" && $bugfilter['dir'] == "ASC") {
 			echo			'<input type=hidden name="dir" value="DESC"/>';
 		}else if ($bugfilter['sort'] == "version" && $bugfilter['dir'] == "DESC") {
@@ -412,7 +412,7 @@
 		echo 		'</th>';
 		// corrigé en version
 		echo		'<th class="InText" width="6%">';
-		echo			'<form name="fixed" method="post" action="?type='.$type.'&id='.$group_id.'&pluginname='.$mantisbt->name.'">';
+		echo			'<form name="fixed" method="post" action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'">';
 		if ($bugfilter['sort'] == "fixed_in_version" && $bugfilter['dir'] == "ASC") {
 			echo			'<input type=hidden name="dir" value="DESC"/>';
 		}else if ($bugfilter['sort'] == "fixed_in_version" && $bugfilter['dir'] == "DESC") {
@@ -440,7 +440,7 @@
 		echo 		'</th>';
 		// version cible : Milestone
 		echo		'<th class="InText" width="6%">';
-		echo			'<form name="target" method="post" action="?type='.$type.'&id='.$group_id.'&pluginname='.$mantisbt->name.'">';
+		echo			'<form name="target" method="post" action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'">';
 		if ($bugfilter['sort'] == "target_version" && $bugfilter['dir'] == "ASC") {
 			echo			'<input type=hidden name="dir" value="DESC"/>';
 		}else if ($bugfilter['sort'] == "target_version" && $bugfilter['dir'] == "DESC") {
@@ -528,7 +528,7 @@
 			{
 				echo '| <b>'.$i.'</b>';
 			} else {
-				echo '<form style="display:inline" name="page'.$i.'" method="post" action="?type='.$type.'&id='.$group_id.'&pluginname='.$mantisbt->name.'&page='.$i.'" >';
+				echo '<form style="display:inline" name="page'.$i.'" method="post" action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'&page='.$i.'" >';
 				echo 	'<input type="hidden" name="sort" value="'.$bugfilter['sort'].'" />';
 				echo 	'<input type="hidden" name="dir" value="'.$bugfilter['dir'].'" />';
 				if ( isset($bugfilter['show_status'])) {

Modified: trunk/src/plugins/mantisbt/www/group/index.php
===================================================================
--- trunk/src/plugins/mantisbt/www/group/index.php	2011-02-25 16:00:28 UTC (rev 12373)
+++ trunk/src/plugins/mantisbt/www/group/index.php	2011-02-25 16:02:43 UTC (rev 12374)
@@ -32,14 +32,14 @@
 $labelTitle[] = _('Roadmap');
 $labelTitle[] = _('Tickets');
 $labelPage = array();
-$labelPage[] = "/plugins/".$mantisbt->name."/?type=group&id=".$group_id."&pluginname=".$mantisbt->name."&view=roadmap";
-$labelPage[] = "/plugins/".$mantisbt->name."/?type=group&id=".$group_id."&pluginname=".$mantisbt->name;
+$labelPage[] = "/plugins/".$mantisbt->name."/?type=group&group_id=".$group_id."&pluginname=".$mantisbt->name."&view=roadmap";
+$labelPage[] = "/plugins/".$mantisbt->name."/?type=group&group_id=".$group_id."&pluginname=".$mantisbt->name;
 $userperm = $group->getPermission($user);
 if ($userperm->isAdmin()) {
 	$labelTitle[] = _('Administration');
-	$labelPage[] = "/plugins/".$mantisbt->name."/?type=admin&id=".$group_id."&pluginname=".$mantisbt->name;
+	$labelPage[] = "/plugins/".$mantisbt->name."/?type=admin&group_id=".$group_id."&pluginname=".$mantisbt->name;
 	$labelTitle[] = _('Statistics');
-	$labelPage[] = "/plugins/".$mantisbt->name."/?type=admin&id=".$group_id."&pluginname=".$mantisbt->name."&view=stat";
+	$labelPage[] = "/plugins/".$mantisbt->name."/?type=admin&group_id=".$group_id."&pluginname=".$mantisbt->name."&view=stat";
 }
 
 echo $HTML->subMenu($labelTitle, $labelPage);




More information about the Fusionforge-commits mailing list