[Fusionforge-commits] r12423 - in trunk/src/plugins/mantisbt: action common view www www/admin www/group
Franck VILLAUME
nerville at fusionforge.org
Mon Feb 28 15:25:57 CET 2011
Author: nerville
Date: 2011-02-28 15:25:56 +0100 (Mon, 28 Feb 2011)
New Revision: 12423
Modified:
trunk/src/plugins/mantisbt/action/addNote.php
trunk/src/plugins/mantisbt/action/deleteNote.php
trunk/src/plugins/mantisbt/action/updateNote.php
trunk/src/plugins/mantisbt/common/MantisBTPlugin.class.php
trunk/src/plugins/mantisbt/view/addOrEditNote.php
trunk/src/plugins/mantisbt/view/viewIssues.php
trunk/src/plugins/mantisbt/www/admin/index.php
trunk/src/plugins/mantisbt/www/getAttachment.php
trunk/src/plugins/mantisbt/www/group/index.php
Log:
make it work ... numerous fix
Modified: trunk/src/plugins/mantisbt/action/addNote.php
===================================================================
--- trunk/src/plugins/mantisbt/action/addNote.php 2011-02-28 13:54:47 UTC (rev 12422)
+++ trunk/src/plugins/mantisbt/action/addNote.php 2011-02-28 14:25:56 UTC (rev 12423)
@@ -1,7 +1,10 @@
<?php
/*
- * Copyright 2010, Franck Villaume - Capgemini
+ * MantisBT plugin
*
+ * Copyright 2010-2011, Franck Villaume - Capgemini
+ * http://fusionforge.org
+ *
* This file is part of FusionForge.
*
* FusionForge is free software; you can redistribute it and/or modify
@@ -19,8 +22,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+global $mantisbt;
+global $mantisbtConf;
+global $username;
+global $password;
+global $group_id;
+
try {
- $clientSOAP = new SoapClient(forge_get_config('server_url','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));
$noteEdit;
$note['text'] = $_POST['edit_texte_note'];
@@ -48,7 +57,7 @@
$feedback = _('Note added successfully');
} catch (SoapFault $soapFault) {
$error_msg = _('Task failed:').' '.$soapFault->faultstring;
- session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($error_msg));
+ session_redirect('plugins/mantisbt/?type=group&group_id='.$group_id.'&pluginname='.$mantisbt->name.'&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($error_msg));
}
-session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&feedback='.urlencode($feedback));
+session_redirect('plugins/mantisbt/?type=group&group_id='.$group_id.'&pluginname='.$mantisbt->name.'&idBug='.$idBug.'&view=viewIssue&feedback='.urlencode($feedback));
?>
Modified: trunk/src/plugins/mantisbt/action/deleteNote.php
===================================================================
--- trunk/src/plugins/mantisbt/action/deleteNote.php 2011-02-28 13:54:47 UTC (rev 12422)
+++ trunk/src/plugins/mantisbt/action/deleteNote.php 2011-02-28 14:25:56 UTC (rev 12423)
@@ -1,7 +1,10 @@
<?php
/*
- * Copyright 2010, Franck Villaume - Capgemini
+ * MantisBT plugin
*
+ * Copyright 2010-2011, Franck Villaume - Capgemini
+ * http://fusionforge.org
+ *
* This file is part of FusionForge.
*
* FusionForge is free software; you can redistribute it and/or modify
@@ -19,13 +22,21 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+global $mantisbt;
+global $mantisbtConf;
+global $username;
+global $password;
+global $group_id;
+
try {
- $clientSOAP = new SoapClient(forge_get_config('server_url','mantisbt')."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
+ if (!isset($clientSOAP))
+ $clientSOAP = new SoapClient($mantisbtConf['url']."/api/soap/mantisconnect.php?wsdl", array('trace'=>true, 'exceptions'=>true));
+
$clientSOAP->__soapCall('mc_issue_note_delete', array("username" => $username, "password" => $password, "issue_note_id" => $idNote));
} catch (SoapFault $soapFault) {
$feedback = _('Task failed:').' '.$soapFault->faultstring;
- session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($feedback));
+ session_redirect('plugins/mantisbt/?type=group&group_id='.$group_id.'&pluginname='.$mantisbt->name.'&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($feedback));
}
$feedback = _('Note deleted successfully');
-session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&feedback='.urlencode($feedback));
+session_redirect('plugins/mantisbt/?type=group&group_id='.$group_id.'&pluginname='.$mantisbt->name.'&idBug='.$idBug.'&view=viewIssue&feedback='.urlencode($feedback));
?>
Modified: trunk/src/plugins/mantisbt/action/updateNote.php
===================================================================
--- trunk/src/plugins/mantisbt/action/updateNote.php 2011-02-28 13:54:47 UTC (rev 12422)
+++ trunk/src/plugins/mantisbt/action/updateNote.php 2011-02-28 14:25:56 UTC (rev 12423)
@@ -1,7 +1,10 @@
<?php
/*
- * Copyright 2010, Franck Villaume - Capgemini
+ * MantisBT plugin
*
+ * Copyright 2010-2011, Franck Villaume - Capgemini
+ * http://fusionforge.org
+ *
* This file is part of FusionForge.
*
* FusionForge is free software; you can redistribute it and/or modify
@@ -19,8 +22,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+global $mantisbt;
+global $mantisbtConf;
+global $username;
+global $password;
+global $group_id;
+
$noteEdit;
-$clientSOAP = new SoapClient(forge_get_config('server_url','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));
foreach($defect->notes as $key => $note){
if ($note->id == $idNote){
@@ -35,7 +44,7 @@
$clientSOAP->__soapCall('mc_issue_note_update', array("username" => $username, "password" => $password, "issue_id" => $idBug, "issue_note_id" => $idNote, "note" => $noteEdit, "type_update" => "text"));
} catch (SoapFault $soapFault) {
$error_msg = _('Task failed:').' '.$soapFault->faultstring;
- session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($error_msg));
+ session_redirect('plugins/mantisbt/?type=group&group_id='.$group_id.'&pluginname='.$mantisbt->name.'&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($error_msg));
}
} else {
$listViewStates = $clientSOAP->__soapCall('mc_enum_view_states', array("username" => $username, "password" => $password));
@@ -51,11 +60,11 @@
$clientSOAP->__soapCall('mc_issue_note_update', array("username" => $username, "password" => $password, "issue_id" => $idBug, "issue_note_id" => $idNote, "note" => $noteEdit, "type_update" => "state"));
} catch (SoapFault $soapFault) {
$error_msg = _('Task failed:').' '.$soapFault->faultstring;
- session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($error_msg));
+ session_redirect('plugins/mantisbt/?type=group&group_id='.$group_id.'&pluginname='.$mantisbt->name.'&idBug='.$idBug.'&view=viewIssue&error_msg='.urlencode($error_msg));
}
}
$feedback = _('Task succeeded');
-session_redirect('plugins/mantisbt/?type=group&id='.$id.'&pluginname=mantisbt&idBug='.$idBug.'&view=viewIssue&feedback='.urlencode($feedback));
+session_redirect('plugins/mantisbt/?type=group&group_id='.$group_id.'&pluginname='.$mantisbt->name.'&idBug='.$idBug.'&view=viewIssue&feedback='.urlencode($feedback));
?>
Modified: trunk/src/plugins/mantisbt/common/MantisBTPlugin.class.php
===================================================================
--- trunk/src/plugins/mantisbt/common/MantisBTPlugin.class.php 2011-02-28 13:54:47 UTC (rev 12422)
+++ trunk/src/plugins/mantisbt/common/MantisBTPlugin.class.php 2011-02-28 14:25:56 UTC (rev 12423)
@@ -519,9 +519,11 @@
/**
* getSubMenu - display the submenu
+ *
+ * @param int enable tooltips : default NO
* @return bool true only currently
*/
- function getSubMenu() {
+ function getSubMenu($enable_tooltips = 0) {
global $HTML;
global $group_id;
global $user;
@@ -533,15 +535,30 @@
$labelPage = array();
$labelPage[] = "/plugins/mantisbt/?type=group&group_id=".$group_id."&pluginname=".$this->name."&view=roadmap";
$labelPage[] = "/plugins/mantisbt/?type=group&group_id=".$group_id."&pluginname=".$this->name;
+ $labelAttr = array();
+ if ($enable_tooltips) {
+ $labelAttr[] = array('title' => _('View the roadmap, per version tickets'), 'id' => 'roadmapView');
+ $labelAttr[] = array('title' => _('View all tickets.'), 'id' => 'ticketView');
+ } else {
+ $labelAttr[] = array();
+ $labelAttr[] = array();
+ }
$userperm = $group->getPermission($user);
if ( $userperm->isAdmin() ) {
$labelTitle[] = _('Administration');
$labelPage[] = "/plugins/mantisbt/?type=admin&group_id=".$group_id."&pluginname=".$this->name;
$labelTitle[] = _('Statistics');
$labelPage[] = "/plugins/mantisbt/?type=admin&group_id=".$group_id."&pluginname=".$this->name."&view=stat";
+ if ($enable_tooltips) {
+ $labelAttr[] = array('title' => _('Manage versions, categories and general configuration.'), 'id' => 'adminView');
+ $labelAttr[] = array('title' => _('View global statistics.'), 'id' => 'statView');
+ } else {
+ $labelAttr[] = array();
+ $labelAttr[] = array();
+ }
}
- echo $HTML->subMenu($labelTitle, $labelPage);
+ echo $HTML->subMenu($labelTitle, $labelPage, $labelAttr);
}
/**
Modified: trunk/src/plugins/mantisbt/view/addOrEditNote.php
===================================================================
--- trunk/src/plugins/mantisbt/view/addOrEditNote.php 2011-02-28 13:54:47 UTC (rev 12422)
+++ trunk/src/plugins/mantisbt/view/addOrEditNote.php 2011-02-28 14:25:56 UTC (rev 12423)
@@ -63,7 +63,8 @@
echo '<form Method="POST" Action="?type='.$type.'&group_id='.$group_id.'&pluginname='.$mantisbt->name.'&idBug='.$defect->id.'&idNote='.$idNote.'&action='.$actionform.'&view=viewIssue">';
echo '<table class="innertabs">';
echo '<tr>';
- echo '<td class="FullBox" ><textarea name="edit_texte_note" style="width:99%;" rows=12>'.(isset($noteEdit->text))? '' : $noteEdit->text.'</textarea></td>';
+ (isset($noteEdit->text))? $note_value = $noteEdit->text : $note_value = '';
+ echo '<td class="FullBox" ><textarea name="edit_texte_note" style="width:99%;" rows=12>'.$note_value.'</textarea></td>';
echo '</tr>';
echo '</table>';
echo '<input type=button onclick="this.form.submit();this.disabled=true;" value="'.$labelButtonSubmit.'">';
Modified: trunk/src/plugins/mantisbt/view/viewIssues.php
===================================================================
--- trunk/src/plugins/mantisbt/view/viewIssues.php 2011-02-28 13:54:47 UTC (rev 12422)
+++ trunk/src/plugins/mantisbt/view/viewIssues.php 2011-02-28 14:25:56 UTC (rev 12423)
@@ -236,7 +236,7 @@
}
}
echo '<input type=hidden name="sort" value="category_id" />';
- echo '<a class="DataLink" href="javascript:document.filtercat.submit();">Catégorie';
+ echo '<a class="DataLink" href="javascript:document.filtercat.submit();">'._('Category');
if ($bugfilter['sort'] == "category_id" && $bugfilter['dir'] == "ASC" ){
echo '<img src="'.$picto_haut.'">';
}else if ($bugfilter['sort'] == "category_id" && $bugfilter['dir'] == "DESC" ) {
@@ -264,7 +264,7 @@
}
}
echo '<input type=hidden name="sort" value="project_id" />';
- echo '<a class="DataLink" href="javascript:document.projectid.submit();">Projet';
+ echo '<a class="DataLink" href="javascript:document.projectid.submit();">'._('Project');
if ($bugfilter['sort'] == "project_id" && $bugfilter['dir'] == "ASC" ){
echo '<img src="'.$picto_haut.'">';
}else if ($bugfilter['sort'] == "project_id" && $bugfilter['dir'] == "DESC" ) {
@@ -292,7 +292,7 @@
}
}
echo '<input type=hidden name="sort" value="severity" />';
- echo '<a class="DataLink" href="javascript:document.severity.submit();">Sévérité';
+ echo '<a class="DataLink" href="javascript:document.severity.submit();">'._('Severity');
if ($bugfilter['sort'] == "severity" && $bugfilter['dir'] == "ASC" ){
echo '<img src="'.$picto_haut.'">';
}else if ($bugfilter['sort'] == "severity" && $bugfilter['dir'] == "DESC" ) {
@@ -320,7 +320,7 @@
}
}
echo '<input type=hidden name="sort" value="status" />';
- echo '<a class="DataLink" href="javascript:document.statusid.submit();">Etat';
+ echo '<a class="DataLink" href="javascript:document.statusid.submit();">'._('Status');
if ($bugfilter['sort'] == "status" && $bugfilter['dir'] == "ASC" ){
echo '<img src="'.$picto_haut.'">';
}else if ($bugfilter['sort'] == "status" && $bugfilter['dir'] == "DESC" ) {
@@ -348,7 +348,7 @@
}
}
echo '<input type=hidden name="sort" value="last_updated" />';
- echo '<a class="DataLink" href="javascript:document.lastupdate.submit();">Mis à jour';
+ echo '<a class="DataLink" href="javascript:document.lastupdate.submit();">'._('Last update');
if ($bugfilter['sort'] == "last_updated" && $bugfilter['dir'] == "ASC" ){
echo '<img src="'.$picto_haut.'">';
}else if ($bugfilter['sort'] == "last_updated" && $bugfilter['dir'] == "DESC" ) {
@@ -376,7 +376,7 @@
}
}
echo '<input type=hidden name="sort" value="summary" />';
- echo '<a class="DataLink" href="javascript:document.summary.submit();">Résumé';
+ echo '<a class="DataLink" href="javascript:document.summary.submit();">'._('Summary');
if ($bugfilter['sort'] == "summary" && $bugfilter['dir'] == "ASC" ){
echo '<img src="'.$picto_haut.'">';
}else if ($bugfilter['sort'] == "summary" && $bugfilter['dir'] == "DESC" ) {
@@ -405,7 +405,7 @@
}
}
echo '<input type=hidden name="sort" value="version" />';
- echo '<a class="DataLink" href="javascript:document.version.submit();">Détecté en';
+ echo '<a class="DataLink" href="javascript:document.version.submit();">'._('Detected in');
if ($bugfilter['sort'] == "version" && $bugfilter['dir'] == "ASC" ){
echo '<img src="'.$picto_haut.'">';
}else if ($bugfilter['sort'] == "version" && $bugfilter['dir'] == "DESC" ) {
@@ -433,7 +433,7 @@
}
}
echo '<input type=hidden name="sort" value="fixed_in_version" />';
- echo '<a class="DataLink" href="javascript:document.fixed.submit();">Corrigé en';
+ echo '<a class="DataLink" href="javascript:document.fixed.submit();">'._('Fixed in');
if ($bugfilter['sort'] == "fixed_in_version" && $bugfilter['dir'] == "ASC" ){
echo '<img src="'.$picto_haut.'">';
}else if ($bugfilter['sort'] == "fixed_in_version" && $bugfilter['dir'] == "DESC" ) {
@@ -461,7 +461,7 @@
}
}
echo '<input type=hidden name="sort" value="target_version" />';
- echo '<a class="DataLink" href="javascript:document.target.submit();">Milestone';
+ echo '<a class="DataLink" href="javascript:document.target.submit();">'._('Target');
if ($bugfilter['sort'] == "target_version" && $bugfilter['dir'] == "ASC" ){
echo '<img src="'.$picto_haut.'">';
}else if ($bugfilter['sort'] == "target_version" && $bugfilter['dir'] == "DESC" ) {
Modified: trunk/src/plugins/mantisbt/www/admin/index.php
===================================================================
--- trunk/src/plugins/mantisbt/www/admin/index.php 2011-02-28 13:54:47 UTC (rev 12422)
+++ trunk/src/plugins/mantisbt/www/admin/index.php 2011-02-28 14:25:56 UTC (rev 12423)
@@ -25,11 +25,11 @@
global $mantisbtConf;
global $username;
global $password;
+global $use_tooltips;
+global $view;
-$view = getStringFromRequest('view');
+$mantisbt->getSubMenu($use_tooltips);
-$mantisbt->getSubMenu();
-
switch ($view) {
case "editVersion":
case "stat": {
Modified: trunk/src/plugins/mantisbt/www/getAttachment.php
===================================================================
--- trunk/src/plugins/mantisbt/www/getAttachment.php 2011-02-28 13:54:47 UTC (rev 12422)
+++ trunk/src/plugins/mantisbt/www/getAttachment.php 2011-02-28 14:25:56 UTC (rev 12423)
@@ -1,9 +1,10 @@
<?php
-
/*
- * Copyright 2010, Capgemini
- * Author: Franck Villaume - Capgemini
+ * MantisBT plugin
*
+ * Copyright 2010-2011, Franck Villaume - Capgemini
+ * http://fusionforge.org
+ *
* This file is part of FusionForge.
*
* FusionForge is free software; you can redistribute it and/or modify
Modified: trunk/src/plugins/mantisbt/www/group/index.php
===================================================================
--- trunk/src/plugins/mantisbt/www/group/index.php 2011-02-28 13:54:47 UTC (rev 12422)
+++ trunk/src/plugins/mantisbt/www/group/index.php 2011-02-28 14:25:56 UTC (rev 12423)
@@ -26,8 +26,9 @@
global $mantisbtConf;
global $group_id;
global $gfplugins;
+global $use_tooltips;
-$mantisbt->getSubMenu();
+$mantisbt->getSubMenu($use_tooltips);
// page a afficher
switch ($view) {
More information about the Fusionforge-commits
mailing list