tutos-commits Mailing List for TUTOS

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8058/php/bugtracking

Modified Files:
      Tag: BRANCH-2-0
	bug_overview.php 
Log Message:
Bugfix: link with mantis module when change status in massupdate

Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v
retrieving revision 1.8.2.30
retrieving revision 1.8.2.31
diff -u -r1.8.2.30 -r1.8.2.31
--- bug_overview.php	19 Jan 2006 10:34:52 -0000	1.8.2.30
+++ bug_overview.php	22 Sep 2006 13:44:16 -0000	1.8.2.31
@@ -12,6 +12,7 @@
  include_once 'permission.p3';
  include_once 'product.pinc';
  include_once 'timetrack.pinc';
+ include_once 'mantis/mantis.pinc';
 
  require_once 'layout/layout.pinc';
 
@@ -19,7 +20,7 @@
  check_user();
  loadmodules("bugtracking","overview");
  loadmodule("bugtracking");
-
+ 
  /**
   * show a overview of bugs
   */
@@ -468,7 +469,7 @@
     * action via massupdate
     */
    Function action() {
-     global $lang,$msg;
+     global $tutos,$lang,$msg;
 
      if ( $_GET['action'] == -2 ) {
        /**
@@ -530,6 +531,14 @@
            if ( $a[1] == "S" ) {
              $lmsg .= $b->getLink() ." ". $lang['BugState']." = ".$lang['BugStates'][$a[2]]."<br>";
 	     $h->state = $a[2];
+	     
+             // *
+             // * Adding notif mantis bug
+             // *
+             if ( $tutos[usemantisbug] ) {
+               mantisExportBugStatus($b, $h);
+             }
+             
            }
 	   else if ( $a[1] == "C" ) {
              $lmsg .= $b->getLink() ." ". $lang['BugClass'] ." = ". $lang['BugClasses'][$a[2]]."<br>";

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4693

Modified Files:
      Tag: BRANCH-1-3
	product_role_new.php 
Log Message:
fix

Index: product_role_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_role_new.php,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- product_role_new.php	19 Sep 2006 07:02:35 -0000	1.7.2.1
+++ product_role_new.php	22 Sep 2006 07:02:06 -0000	1.7.2.2
@@ -114,6 +114,8 @@
        $rdesc = 'r'.($i+1).'desc';
        if ( isset($_GET[$rdesc]) ) {
          $this->desc[$i+1] = $_GET[$rdesc];
+       } else {
+         $this->desc[$i+1] = '';
        }
        $this->addRoleInput($this->rid[$i], $i+1);
      }

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11123/bugtracking

Modified Files:
      Tag: BRANCH-1-3
	bug.pinc 
Log Message:
fixes

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -r1.39 -r1.39.2.1
--- bug.pinc	11 Jul 2006 06:55:36 -0000	1.39
+++ bug.pinc	19 Sep 2006 07:02:35 -0000	1.39.2.1
@@ -497,7 +497,10 @@
     if ( ! empty($m) ) {
       return $lang['BugMediums'][$m];
     }
-    return $lang['BugMediums'][$this->medium];
+    if ( ! empty($this->medium) ) {
+      return $lang['BugMediums'][$this->medium];
+    }
+    return "";
   }
   /** ---------------------------------------------------------------------------
    */

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11123

Modified Files:
      Tag: BRANCH-1-3
	product_role_ins.php product_role_new.php 
Log Message:
fixes

Index: product_role_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_role_ins.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- product_role_ins.php	19 Jul 2004 19:08:44 -0000	1.3
+++ product_role_ins.php	19 Sep 2006 07:02:35 -0000	1.3.2.1
@@ -49,29 +49,33 @@
 
  $nbadd = $_POST['nbadd'];
 
-for($i=1; $i<=$nbadd; $i++) {
-  $rid   = 'r'.$i.'id';
-  $fn    = 'r'.$i.'fn';
-  $l     = 'r'.$i.'l';
-  $role  = 'role'.$i;
-  $rdesc = 'r'.$i.'desc';
+ for($i=1; $i<=$nbadd; $i++) {
+   $rid   = 'r'.$i.'id';
+   $fn    = 'r'.$i.'fn';
+   $l     = 'r'.$i.'l';
+   $role  = 'role'.$i;
+   $rdesc = 'r'.$i.'desc';
 
- if ( isset($_POST[$fn]) ) {
-   $m = check_field(StripSlashes($_POST[$fn]), $fn, $l,
+   if ( isset($_POST[$fn]) ) {
+     $m = check_field(StripSlashes($_POST[$fn]), $fn, $l,
 		    $tutos[rolecheck][$_POST[$role]]);
 
-   if ( $m->id > 0 ) {
-     $p->setRole($m,$_POST[$role], StripSlashes($_POST[$rdesc]));
+     if ( $m->id > 0 ) {
+       $p->setRole($m,$_POST[$role], StripSlashes($_POST[$rdesc]));
+     }
    }
+   if ( isset($_POST[$rid]) ) {
+     $m = getObject($dbconn, $_POST[$rid]);
+     if (! $m->use_ok()) {
+       $msg .= sprintf($lang['Err0001'],$lang[$m->getType()],$m->getFullname()) ."<br />";
+     } else {
+       $p->setRole($m, $_POST[$role], StripSlashes($_POST[$rdesc]));
+     }
+   }
+   $gotourl= addUrlParameter($gotourl, $role."=". $_POST[$role], true);
+   $gotourl= addUrlParameter($gotourl, $rdesc."=".UrlEncode($_POST[$rdesc]),true);
+   $gotourl= addUrlParameter($gotourl, "rid[]=".UrlEncode($_POST[$rid]),true);
  }
- if ( isset($_POST[$rid]) ) {
-   $m = getObject($dbconn, $_POST[$rid]);
-   $p->setRole($m, $_POST[$role], StripSlashes($_POST[$rdesc]));
- }
- $gotourl= addUrlParameter($gotourl, $role."=". $_POST[$role], true);
- $gotourl= addUrlParameter($gotourl,
-			   $rdesc."=".UrlEncode($_POST[$rdesc]),true);
-}
 
  if ( $msg == "" ) {
    $dbconn->Begin("WORK");
@@ -92,4 +96,4 @@
   *  CVS Info:  $Id$
   *  $Author$
   */
-?>
\ No newline at end of file
+?>

Index: product_role_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_role_new.php,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- product_role_new.php	27 Oct 2004 07:27:47 -0000	1.7
+++ product_role_new.php	19 Sep 2006 07:02:35 -0000	1.7.2.1
@@ -49,10 +49,10 @@
 
      $worker = getObject($this->dbconn,$rid);
      echo " <td>". $worker->getLink() ."</td>\n";
-     echo " <input type=\"hidden\" id=\"r".$count."\" ".
-       "name=\"r".$count."fn\" value=\"".$worker->getFullName()."\">\n";
+#     echo " <input type=\"hidden\" id=\"r".$count."\" ". "name=\"r".$count."fn\" value=\"".$worker->getFullName()."\">\n";
+     echo ' <input type="hidden" id="r'.$count.'" name="r'.$count.'id" value="'.$worker->id."\">\n";
 
-     echo " <td><input id=\"r".$count."desc\" name=\"r".$count."desc\" value=\"". myentities($this->r1desc). "\" size=\"". min(30,$table['product2']['description'][size])."\" maxlength=\"". $table['product2']['description'][size] ."\"></td>\n";
+     echo ' <td><input id="r'.$count.'desc" name="r'.$count.'desc" value="'. myentities($this->desc[$count]). '" size="'. min(30,$table['product2']['description'][size]).'" maxlength="'. $table['product2']['description'][size] ."\"></td>\n";
      echo "</tr>\n";
    }
 
@@ -110,9 +110,13 @@
      }
 
      # Add input boxes for new selected people
-     for($i=0; $i < count($this->rid); $i++)
+     for($i=0; $i < count($this->rid); $i++) {
+       $rdesc = 'r'.($i+1).'desc';
+       if ( isset($_GET[$rdesc]) ) {
+         $this->desc[$i+1] = $_GET[$rdesc];
+       }
        $this->addRoleInput($this->rid[$i], $i+1);
-
+     }
      echo "<tr>\n";
      if ( $this->obj->id != -1 ) {
        submit_reset(0,1,1,1,1,1);
@@ -141,8 +145,7 @@
 
      $this->name = $lang['Product'];
      $this->obj = new product($this->dbconn);
-     $this->r1desc = "";
-     $this->r2desc = "";
+     $this->desc = array();
 
      $this->template = false;
 
@@ -176,7 +179,7 @@
        $rid = $_GET['rid'];
 
        if( is_array($rid) )
-     $this->rid = $rid;
+         $this->rid = $rid;
 
        $this->obj->r1 = new tutos_user($this->dbconn);
        $this->obj->r1 = $this->obj->r1->read($this->rid[0],$this->obj->r1);

Update of /cvsroot/tutos/tutos
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13947

Modified Files:
	Makefile 
Log Message:
release

Index: Makefile
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- Makefile	25 Jul 2006 07:15:32 -0000	1.81
+++ Makefile	14 Sep 2006 18:09:57 -0000	1.82
@@ -15,6 +15,9 @@
 #
 #
 # $Log$
+# Revision 1.82  2006/09/14 18:09:57  gokohnert
+# release
+#
 # Revision 1.81  2006/07/25 07:15:32  gokohnert
 # fixes
 #
@@ -291,7 +294,7 @@
 #
 
 # Primary Version
-VERSION = 1.3beta
+VERSION = 1.3
 #
 # The full Version is VERSION.DATE
 #

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13947/php

Modified Files:
	config_default.pinc 
Log Message:
release

Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- config_default.pinc	16 Jul 2006 11:10:42 -0000	1.109
+++ config_default.pinc	14 Sep 2006 18:09:57 -0000	1.110
@@ -791,6 +791,6 @@
 #
 # The TUTOS Version number
 #
-$tutos[version] = '1.3beta.20060701';
+$tutos[version] = '1.3.20060914';
 #
 ?>
\ No newline at end of file

Update of /cvsroot/tutos/tutos/php/db
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8480/php/db

Modified Files:
	db_pg.pinc table.pinc 
Log Message:
fixes

Index: db_pg.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_pg.pinc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- db_pg.pinc	3 Apr 2005 18:32:13 -0000	1.31
+++ db_pg.pinc	14 Sep 2006 10:16:59 -0000	1.32
@@ -587,7 +587,10 @@
    */
   function createsequence(&$seq) {
     $q = "create sequence ". $this->prefix . $seq[name] ." start ". $seq['start'];
-    return $this->Exec($q,0);
+    $r =  $this->Exec($q,0);
+    $q = "COMMENT ON SEQUENCE ". $this->prefix . $seq[name] ." is '". $seq[Desc]."'";
+    $this->Exec($q,0);
+    return $r;
   }
   /**
    * get the phrase to limit a selection to a specific range
@@ -686,4 +689,4 @@
   }
 
 }
-?>
\ No newline at end of file
+?>

Index: table.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/table.pinc,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- table.pinc	16 Jul 2006 11:10:42 -0000	1.35
+++ table.pinc	14 Sep 2006 10:16:59 -0000	1.36
@@ -213,8 +213,8 @@
 $tableidx['appointment11'] = array(
   name  => "cal_rep_idx1",
   table => "calendar",
-  column => array("repeat"),
-  Desc  => "ref cal - repeat",
+  column => array("repeat_type"),
+  Desc  => "ref cal - repeat_type",
 );
 $tableidx['appointment12'] = array(
   name  => "cal_rep_idx2",

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8480/php

Modified Files:
	webelements.p3 
Log Message:
fixes

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- webelements.p3	25 Jul 2006 11:19:56 -0000	1.303
+++ webelements.p3	14 Sep 2006 10:16:58 -0000	1.304
@@ -543,7 +543,7 @@
   if (isset($_SERVER['REMOTE_ADDR'])) {
     echo "<b>Called by:</b>&nbsp;". $_SERVER['REMOTE_ADDR'] ."<br />\n";
   }
-  echo "<a href=\"phpinfo.php\">PHP Info Page</a><br />\n";
+  echo "<a href=\"admin/phpinfo.php\">PHP Info Page</a><br />\n";
 
   echo "<b>Included Files:<br />\n";
   $included_files = get_included_files();

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8480/php/bugtracking

Modified Files:
	bug_overview.php 
Log Message:
fixes

Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- bug_overview.php	24 Jul 2006 15:34:07 -0000	1.24
+++ bug_overview.php	14 Sep 2006 10:16:59 -0000	1.25
@@ -103,6 +103,9 @@
        $worksheet1->set_column($c,$c,20); # Solver
        $worksheet1->write_string($x,$c++, $lang['BugAssignedTo'],$format1);
 
+       $worksheet1->set_column($c,$c,20); # Creator
+       $worksheet1->write_string($x,$c++, $lang['BugCreator'],$format1);
+
        $x = 2;
        foreach ($this->blist as $i => $z) {
          $b = &$this->blist[$i];
@@ -128,6 +131,11 @@
          } else {
            $worksheet1->write_string($x,$c++,$lang['HistoryDeleted'],$format2);
          }
+         if ($b->creator->id > 0) {
+           $worksheet1->write_string($x,$c++, $b->creator->getShortname(),$format2);
+         } else {
+           $worksheet1->write_string($x,$c++,$lang['HistoryDeleted'],$format2);
+         }
          $x++;
          unset($b);
        }

Update of /cvsroot/tutos/tutos/templates/classic
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32253/templates/classic

Modified Files:
      Tag: BRANCH-2-0
	product_show.tpl 
Log Message:
CHANG: dynamic view off child product in product_show

Index: product_show.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/product_show.tpl,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- product_show.tpl	16 Aug 2006 14:17:03 -0000	1.1.2.19
+++ product_show.tpl	11 Sep 2006 12:35:31 -0000	1.1.2.20
@@ -6,6 +6,19 @@
   We will display informations in little boxes, and as I don't know how to
   obtain the wanted layout with css positionning, I use a surrouding table.
 *}
+{literal}
+<script type="text/javascript" language="JavaScript">
+<!--
+function toggleDisplay(elt) {
+  if ( elt.style.display != 'block') {
+    elt.style.display = 'block';
+  } else {
+    elt.style.display = 'none';
+  }
+}
+//-->
+</script>
+{/literal}
 <table>
 <colgroup>
 <col width="30%">
@@ -51,15 +64,27 @@
 {/if}
 
 <tr>
-<td class="desc" valign="top">{$SubProjects.label}</td>
-{if count($SubProjects.value) == 0}
+<td class="desc" valign="top">{$SubProjects.label}
+{if count($SubProjects.valueoff) > 0}
+  <span title="{$SubProjects.title}" style="cursor:pointer;" >
+    <img src="{$base}/html/classic/projects.png" alt="projectsclosed" />
+  </span>
+{/if}
+</td>
+{if $SubProjects.count == 0}
 <td colspan="3">&nbsp;</td>
 {else}
 <td colspan="3" class="data">
-{foreach from=$SubProjects.value item=s name=sp}
-<a href="{$base}/php/{$s.link}" title="{$s.title}">{$s.name}</a>
-{if not $smarty.foreach.sp.last}<br>{/if}
+{foreach from=$SubProjects.valueon item=s1 name=sp1}
+<a href="{$base}/php/{$s1.link}" title="{$s1.title}">{$s1.name}</a>
+{if not $smarty.foreach.sp1.last}<br>{/if}
+{/foreach}
+<p id="subpoff" style="margin:0; display:none;">
+{foreach from=$SubProjects.valueoff item=s0 name=sp0}
+<a href="{$base}/php/{$s0.link}" title="{$s0.title}"><i>{$s0.name}</i></a>
+{if not $smarty.foreach.sp0.last}<br>{/if}
 {/foreach}
+</p>
 </td>
 {/if}
 </tr>

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32253/php

Modified Files:
      Tag: BRANCH-2-0
	product_show.php 
Log Message:
CHANG: dynamic view off child product in product_show

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.90.2.28
retrieving revision 1.90.2.29
diff -u -r1.90.2.28 -r1.90.2.29
--- product_show.php	16 Aug 2006 14:17:02 -0000	1.90.2.28
+++ product_show.php	11 Sep 2006 12:35:31 -0000	1.90.2.29
@@ -114,16 +114,29 @@
      /**
       * Sub Projects
       */
-     $sps = array();
+     $spson  = array();
+     $spsoff = array();
      foreach( $this->obj->getSubProjects() as $sp ) {
-       $sps[] = array('name'  => $sp->getFullName(),
+       $sptmp = array('name'  => $sp->getFullName(),
 		      'title' => $sp->getFullName(),
-		      'link'  => $sp->getUrl());
+		      'link'  => $sp->getUrl(),
+		      'state' => $sp->state
+		     );
+       if ($sp->state == PROD_STATE_AQ || $sp->state == PROD_STATE_RUN || $sp->state == PROD_STATE_QRUN) {
+         $spson[] = $sptmp;
+       } else {
+         $spsoff[] = $sptmp;
+       }
      }
 
      $this->assign("SubProjects",
 		   array('label' => $lang['SubProjects'],
-			 'value' => $sps));
+		         'title' => $lang['SubProjectsClosed'],
+		         'count' => count($spson) + count($spsoff),
+			 'valueon' => $spson,
+			 'valueoff' => $spsoff
+			)
+		  );
 
      if( in_array($this->obj->state, array(0, 4, 5))
 	 && ( $this->obj->probability != "" ) )

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32253/php/localization

Modified Files:
      Tag: BRANCH-2-0
	fr.p3 
Log Message:
CHANG: dynamic view off child product in product_show

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v
retrieving revision 1.40.2.36
retrieving revision 1.40.2.37
diff -u -r1.40.2.36 -r1.40.2.37
--- fr.p3	16 Aug 2006 14:17:03 -0000	1.40.2.36
+++ fr.p3	11 Sep 2006 12:35:31 -0000	1.40.2.37
@@ -346,6 +346,7 @@
 $lang['ProdRoleAddT']    = "Add a role in %s";
 $lang['SubProject']      = "Sous-projet";
 $lang['SubProjects']     = "Sous-projets";
+$lang['SubProjectsClosed'] = "Voir les sous-projets terminés";
 $lang['ProdSubNew']      = "Nouveau sous-projet";
 $lang['ProdVolEstimate'] = "Estimation de charge";