tutos-commits Mailing List for TUTOS
Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory
Brought to you by:
gokohnert
Menu
▾
▴
tutos-commits — SVN commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(13) |
Aug
(214) |
Sep
(144) |
Oct
(22) |
Nov
(22) |
Dec
(93) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(25) |
Feb
(31) |
Mar
(92) |
Apr
(70) |
May
(103) |
Jun
(130) |
Jul
(265) |
Aug
(325) |
Sep
(233) |
Oct
(244) |
Nov
(261) |
Dec
(157) |
| 2003 |
Jan
(101) |
Feb
(135) |
Mar
(148) |
Apr
(164) |
May
(53) |
Jun
(116) |
Jul
(149) |
Aug
(126) |
Sep
(45) |
Oct
(109) |
Nov
(36) |
Dec
(61) |
| 2004 |
Jan
(131) |
Feb
(236) |
Mar
(278) |
Apr
(259) |
May
(92) |
Jun
(110) |
Jul
(150) |
Aug
(64) |
Sep
(141) |
Oct
(141) |
Nov
(146) |
Dec
(65) |
| 2005 |
Jan
(70) |
Feb
(77) |
Mar
(129) |
Apr
(153) |
May
(161) |
Jun
(63) |
Jul
(42) |
Aug
(16) |
Sep
(30) |
Oct
(3) |
Nov
(8) |
Dec
(40) |
| 2006 |
Jan
(114) |
Feb
(16) |
Mar
(12) |
Apr
(15) |
May
(4) |
Jun
(9) |
Jul
(69) |
Aug
(27) |
Sep
(12) |
Oct
(80) |
Nov
(62) |
Dec
(41) |
| 2007 |
Jan
(34) |
Feb
(2) |
Mar
(38) |
Apr
(82) |
May
(61) |
Jun
(37) |
Jul
(16) |
Aug
(64) |
Sep
(7) |
Oct
(52) |
Nov
(18) |
Dec
(28) |
| 2008 |
Jan
(168) |
Feb
(26) |
Mar
(27) |
Apr
(19) |
May
(10) |
Jun
(58) |
Jul
(58) |
Aug
(91) |
Sep
(14) |
Oct
(23) |
Nov
(56) |
Dec
(38) |
| 2009 |
Jan
(58) |
Feb
(90) |
Mar
(204) |
Apr
(90) |
May
(27) |
Jun
(177) |
Jul
(116) |
Aug
(53) |
Sep
(42) |
Oct
(120) |
Nov
(51) |
Dec
(58) |
| 2010 |
Jan
(117) |
Feb
(231) |
Mar
(163) |
Apr
(90) |
May
(40) |
Jun
(139) |
Jul
(49) |
Aug
(118) |
Sep
(25) |
Oct
(80) |
Nov
(102) |
Dec
(99) |
| 2011 |
Jan
(176) |
Feb
(42) |
Mar
(60) |
Apr
(52) |
May
(30) |
Jun
(29) |
Jul
(27) |
Aug
(16) |
Sep
(51) |
Oct
(70) |
Nov
(63) |
Dec
(58) |
| 2012 |
Jan
(28) |
Feb
(26) |
Mar
(7) |
Apr
(12) |
May
(41) |
Jun
(61) |
Jul
(59) |
Aug
(38) |
Sep
(30) |
Oct
(28) |
Nov
(14) |
Dec
(31) |
| 2013 |
Jan
(24) |
Feb
(54) |
Mar
(45) |
Apr
(22) |
May
(35) |
Jun
(8) |
Jul
(18) |
Aug
(38) |
Sep
(11) |
Oct
(8) |
Nov
(19) |
Dec
(20) |
| 2014 |
Jan
(20) |
Feb
(22) |
Mar
(4) |
Apr
(6) |
May
(13) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2015 |
Jan
|
Feb
(1) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(1) |
| 2016 |
Jan
(4) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(8) |
Aug
(13) |
Sep
(12) |
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2021 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
1
(7) |
2
(2) |
3
|
|
4
|
5
(4) |
6
(3) |
7
(6) |
8
(1) |
9
(4) |
10
(4) |
|
11
|
12
(2) |
13
|
14
(4) |
15
|
16
(1) |
17
|
|
18
|
19
|
20
(1) |
21
(2) |
22
(1) |
23
(10) |
24
|
|
25
|
26
|
27
|
28
|
29
(6) |
30
|
31
|
|
From: <gok...@us...> - 2011-12-29 13:52:33
|
Revision: 503
http://tutos.svn.sourceforge.net/tutos/?rev=503&view=rev
Author: gokohnert
Date: 2011-12-29 13:52:27 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
merge
Modified Paths:
--------------
branches/1.8/php/company.pinc
branches/1.8/php/department.pinc
branches/1.8/php/location.pinc
Modified: branches/1.8/php/company.pinc
===================================================================
--- branches/1.8/php/company.pinc 2011-12-29 13:51:26 UTC (rev 502)
+++ branches/1.8/php/company.pinc 2011-12-29 13:52:27 UTC (rev 503)
@@ -346,18 +346,18 @@
global $current_user,$table;
$msg = '';
- $this->read_locs();
+ $this->read_locs_data();
$msg .= department::obj_delete($current_user,$this);
$r = $this->dbconn->Exec('DELETE from '. $this->tablename .' WHERE id =' .$this->id);
$r->free();
- $r = $this->dbconn->Exec('UPDATE '. $this->dbconn->prefix .$tale['location'][name].' SET c_id = null WHERE c_id =' .$this->id);
+ $r = $this->dbconn->Exec('UPDATE '. $this->dbconn->prefix .$table['location'][name].' SET c_id = null WHERE c_id =' .$this->id);
$r->free();
$msg .= product::obj_delete($current_user,$this);
$msg .= appointment::obj_delete($current_user,$this);
- foreach($this->loc as $f) {
+ foreach($this->location as $f) {
$msg .= $f->delete();
}
Modified: branches/1.8/php/department.pinc
===================================================================
--- branches/1.8/php/department.pinc 2011-12-29 13:51:26 UTC (rev 502)
+++ branches/1.8/php/department.pinc 2011-12-29 13:52:27 UTC (rev 503)
@@ -291,22 +291,22 @@
* Delete a department from the DB
*/
function delete () {
- global $current_user;
+ global $current_user,$table;
$msg = '';
- $this->read_locs();
+ $this->read_locs_data();
$this->dbconn->Lock("location");
- $r = $this->dbconn->Exec("DELETE from ". $this->tablename ." WHERE id =" .$this->id);
+ $r = $this->dbconn->Exec('DELETE from '. $this->tablename .' WHERE id =' .$this->id);
$r->free();
- $r = $this->dbconn->Exec("UPDATE ". $this->dbconn->prefix ."location SET d_id = null WHERE d_id =" .$this->id);
+ $r = $this->dbconn->Exec('UPDATE '. $this->dbconn->prefix .$table['location'][name].' SET d_id = null WHERE d_id =' .$this->id);
$r->free();
$msg .= product::obj_delete($current_user,$this);
$msg .= appointment::obj_delete($current_user,$this);
- foreach($this->loc as $i => $f) {
+ foreach($this->location as $i => $f) {
$msg .= $f->delete();
}
$msg .= parent::delete();
Modified: branches/1.8/php/location.pinc
===================================================================
--- branches/1.8/php/location.pinc 2011-12-29 13:51:26 UTC (rev 502)
+++ branches/1.8/php/location.pinc 2011-12-29 13:52:27 UTC (rev 503)
@@ -55,7 +55,7 @@
* force : true will ignore permissions
* false need see permission on locations
*/
-function read_locs_data (&$obj,$force = false) {
+function read_locs_data (tutos_base $obj,$force = false) {
if (empty($obj->id)) return;
if (! is_object($obj) ) return;
if (-1 == $obj->id) return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-29 13:51:32
|
Revision: 502
http://tutos.svn.sourceforge.net/tutos/?rev=502&view=rev
Author: gokohnert
Date: 2011-12-29 13:51:26 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/company.pinc
trunk/php/department.pinc
trunk/php/location.pinc
Modified: trunk/php/company.pinc
===================================================================
--- trunk/php/company.pinc 2011-12-29 13:43:43 UTC (rev 501)
+++ trunk/php/company.pinc 2011-12-29 13:51:26 UTC (rev 502)
@@ -346,7 +346,7 @@
global $current_user,$table;
$msg = '';
- $this->read_locs();
+ $this->read_locs_data();
$msg .= department::obj_delete($current_user,$this);
$r = $this->dbconn->Exec('DELETE from '. $this->tablename .' WHERE id =' .$this->id);
@@ -357,7 +357,7 @@
$msg .= product::obj_delete($current_user,$this);
$msg .= appointment::obj_delete($current_user,$this);
- foreach($this->loc as $f) {
+ foreach($this->location as $f) {
$msg .= $f->delete();
}
Modified: trunk/php/department.pinc
===================================================================
--- trunk/php/department.pinc 2011-12-29 13:43:43 UTC (rev 501)
+++ trunk/php/department.pinc 2011-12-29 13:51:26 UTC (rev 502)
@@ -291,22 +291,22 @@
* Delete a department from the DB
*/
function delete () {
- global $current_user;
+ global $current_user,$table;
$msg = '';
- $this->read_locs();
+ $this->read_locs_data();
$this->dbconn->Lock("location");
- $r = $this->dbconn->Exec("DELETE from ". $this->tablename ." WHERE id =" .$this->id);
+ $r = $this->dbconn->Exec('DELETE from '. $this->tablename .' WHERE id =' .$this->id);
$r->free();
- $r = $this->dbconn->Exec("UPDATE ". $this->dbconn->prefix ."location SET d_id = null WHERE d_id =" .$this->id);
+ $r = $this->dbconn->Exec('UPDATE '. $this->dbconn->prefix .$table['location'][name].' SET d_id = null WHERE d_id =' .$this->id);
$r->free();
$msg .= product::obj_delete($current_user,$this);
$msg .= appointment::obj_delete($current_user,$this);
- foreach($this->loc as $i => $f) {
+ foreach($this->location as $i => $f) {
$msg .= $f->delete();
}
$msg .= parent::delete();
Modified: trunk/php/location.pinc
===================================================================
--- trunk/php/location.pinc 2011-12-29 13:43:43 UTC (rev 501)
+++ trunk/php/location.pinc 2011-12-29 13:51:26 UTC (rev 502)
@@ -55,7 +55,7 @@
* force : true will ignore permissions
* false need see permission on locations
*/
-function read_locs_data (&$obj,$force = false) {
+function read_locs_data (tutos_base $obj,$force = false) {
if (empty($obj->id)) return;
if (! is_object($obj) ) return;
if (-1 == $obj->id) return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-29 13:43:49
|
Revision: 501
http://tutos.svn.sourceforge.net/tutos/?rev=501&view=rev
Author: gokohnert
Date: 2011-12-29 13:43:43 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/php/company.pinc
Modified: trunk/php/company.pinc
===================================================================
--- trunk/php/company.pinc 2011-12-29 10:48:05 UTC (rev 500)
+++ trunk/php/company.pinc 2011-12-29 13:43:43 UTC (rev 501)
@@ -351,7 +351,7 @@
$r = $this->dbconn->Exec('DELETE from '. $this->tablename .' WHERE id =' .$this->id);
$r->free();
- $r = $this->dbconn->Exec('UPDATE '. $this->dbconn->prefix .$tale['location'][name].' SET c_id = null WHERE c_id =' .$this->id);
+ $r = $this->dbconn->Exec('UPDATE '. $this->dbconn->prefix .$table['location'][name].' SET c_id = null WHERE c_id =' .$this->id);
$r->free();
$msg .= product::obj_delete($current_user,$this);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-29 10:48:11
|
Revision: 500
http://tutos.svn.sourceforge.net/tutos/?rev=500&view=rev
Author: gokohnert
Date: 2011-12-29 10:48:05 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
merge fixes
Modified Paths:
--------------
branches/1.8/Makefile
branches/1.8/homepage/index.html
branches/1.8/php/expense/expense_show.php
branches/1.8/php/localization/zh.p3
branches/1.8/php/stuff/de.p3
branches/1.8/upload.sh
Modified: branches/1.8/Makefile
===================================================================
--- branches/1.8/Makefile 2011-12-29 10:46:31 UTC (rev 499)
+++ branches/1.8/Makefile 2011-12-29 10:48:05 UTC (rev 500)
@@ -645,7 +645,7 @@
@$(ECHO) "# Packages created (PHP)"
upload-php: download-php
- ./upload.sh php ${FULLVERSION}
+ ./upload.sh ${FULLVERSION}
@$(ECHO) "# upload-php to sourceforge finished"
#
Modified: branches/1.8/homepage/index.html
===================================================================
--- branches/1.8/homepage/index.html 2011-12-29 10:46:31 UTC (rev 499)
+++ branches/1.8/homepage/index.html 2011-12-29 10:48:05 UTC (rev 500)
@@ -11,6 +11,6 @@
<p />
<p />
<img border="0" src="../html/tutos.gif" alt="TUTOS" />
-<br /><b><font size="3">LATEST RELEASE IS 1.7.20101228</font></b>
+<br /><b><font size="3">LATEST RELEASE IS 1.8.20111223</font></b>
</center>
<!--#include file="foot1.html.inc" -->
Modified: branches/1.8/php/expense/expense_show.php
===================================================================
--- branches/1.8/php/expense/expense_show.php 2011-12-29 10:46:31 UTC (rev 499)
+++ branches/1.8/php/expense/expense_show.php 2011-12-29 10:48:05 UTC (rev 500)
@@ -159,7 +159,7 @@
$m[category][] = 'obj';
$this->addmenu($m);
- if ( ($this->obj->id > 0) && $this->obj->mod_ok() ) {
+ if ( ($this->obj->id > 0) && $this->obj->mod_ok() && is_object($this->obj->ref) ) {
$x = array( url => 'expense/expense_new.php?link_id='.$this->obj->link_id,
text => $lang['ExpenseCreate'],
info => sprintf($lang['ExpenseCreateInfo'],$this->obj->ref->getFullName()),
Modified: branches/1.8/php/localization/zh.p3
===================================================================
--- branches/1.8/php/localization/zh.p3 2011-12-29 10:46:31 UTC (rev 499)
+++ branches/1.8/php/localization/zh.p3 2011-12-29 10:48:05 UTC (rev 500)
@@ -613,8 +613,8 @@
$lang['acc_info2'] = "银行帐户";
$lang['acc_nr'] = "帐号";
$lang['AdrCustumerID'] = "客户记录识别码";
-$lang['ChangeLocInfo'] = "更改 %2\%s 地址上的 %s";
-$lang['DeleteLocInfo'] = "删除 %2\%s 地址上的 %s";
+$lang['ChangeLocInfo'] = "更改 %2\$s 地址上的 %s";
+$lang['DeleteLocInfo'] = "删除 %2\$s 地址上的 %s";
$lang['AdrLinks'] = "连结";
$lang['AdrCategory'] = "类别";
$lang['AdrDescription'] = "地址名称";
Modified: branches/1.8/php/stuff/de.p3
===================================================================
--- branches/1.8/php/stuff/de.p3 2011-12-29 10:46:31 UTC (rev 499)
+++ branches/1.8/php/stuff/de.p3 2011-12-29 10:48:05 UTC (rev 500)
@@ -44,9 +44,9 @@
$lang['StuffCreate2'] = 'Als Inventar anlegen';
$lang['StuffCreate2Info'] = '%s als neues inventar anlegen';
$lang['StuffShow'] = 'Inventar ansehen';
-$lang['StuffModify'] = 'Inventar aendern';
-$lang['StuffModI'] = 'Inventar %s aendern';
-$lang['StuffDelI'] = 'Inventar %s loeschen';
+$lang['StuffModify'] = 'Inventar ändern';
+$lang['StuffModI'] = 'Inventar %s ändern';
+$lang['StuffDelI'] = 'Inventar %s löschen';
$lang['StuffConfig'] = 'Inventarmanagement konfigurieren';
$lang['StuffConfigHelpAutoname'] = "
a rule how to build the displayed inventory id
@@ -56,7 +56,7 @@
%Y year with four digits
%m month 01-12";
-$lang['perm'][USESTUFF] = "Inventar benutzen";
+$lang['perm'][USESTUFF] = "Inventar benutzen";
$lang['stuff'] = &$lang['Stuff'];
### Local Variables: ***
Modified: branches/1.8/upload.sh
===================================================================
--- branches/1.8/upload.sh 2011-12-29 10:46:31 UTC (rev 499)
+++ branches/1.8/upload.sh 2011-12-29 10:48:05 UTC (rev 500)
@@ -8,14 +8,27 @@
#
# $Id$
#
-export TYPE=$1
-export DATE=$2
+export DATE=$1
#
-/usr/bin/sftp gok...@fr... << EOF
-cd uploads
-put TUTOS-${TYPE}-${DATE}.tar.bz2
-put TUTOS-${TYPE}-${DATE}.tar.gz
-put TUTOS-${TYPE}-${DATE}.zip
+/usr/bin/sftp gokohnert,tu...@fr... << EOF
+mkdir /home/pfs/project/t/tu/tutos/php/${DATE}
+cd /home/pfs/project/t/tu/tutos/php/${DATE}
+put TUTOS-php-${DATE}.tar.bz2
+put TUTOS-php-${DATE}.tar.gz
+put TUTOS-php-${DATE}.zip
+mkdir /home/pfs/project/t/tu/tutos/modules_and_handler/${DATE}
+cd /home/pfs/project/t/tu/tutos/modules_and_handler/${DATE}
+put TUTOS-MODULE-checklist-${DATE}.zip
+put TUTOS-MODULE-doctracker-${DATE}.zip
+put TUTOS-MODULE-drawboard-${DATE}.zip
+put TUTOS-MODULE-ldap-${DATE}.zip
+put TUTOS-MODULE-rssfeed-${DATE}.zip
+put TUTOS-MODULE-scrum-${DATE}.zip
+put TUTOS-MODULE-stuff-${DATE}.zip
+put TUTOS-MODULE-subversion-${DATE}.zip
+put TUTOS-MODULE-TEMPLATE-${DATE}.zip
+put TUTOS-MODULE-testmanager-${DATE}.zip
+put TUTOS-MODULE-ticker-${DATE}.zip
put TUTOS-HDL_cia_factbook-${DATE}.zip
put TUTOS-HDL_fax-${DATE}.zip
put TUTOS-HDL_google_earth-${DATE}.zip
@@ -27,24 +40,22 @@
put TUTOS-HDL_sipgate-${DATE}.zip
put TUTOS-HDL_sms-${DATE}.zip
put TUTOS-HDL_yahoo-${DATE}.zip
+mkdir /home/pfs/project/t/tu/tutos/themes_and_layouts/${DATE}
+cd /home/pfs/project/t/tu/tutos/themes_and_layouts/${DATE}
put TUTOS-THEME-sqli-${DATE}.zip
put TUTOS-THEME-visual-${DATE}.zip
+mkdir /home/pfs/project/t/tu/tutos/languages/${DATE}
+cd /home/pfs/project/t/tu/tutos/languages/${DATE}
put TUTOS-LANG-catalan-${DATE}.zip
put TUTOS-LANG-hungarian-${DATE}.zip
put TUTOS-LANG-japanese-${DATE}.zip
put TUTOS-LANG-portuguese-${DATE}.zip
put TUTOS-LANG-venezuela-${DATE}.zip
-put TUTOS-MODULE-checklist-${DATE}.zip
-put TUTOS-MODULE-drawboard-${DATE}.zip
-put TUTOS-MODULE-expense-${DATE}.zip
-put TUTOS-MODULE-palm-${DATE}.zip
-put TUTOS-MODULE-rssfeed-${DATE}.zip
-put TUTOS-MODULE-ticker-${DATE}.zip
bye
EOF
echo "Ftp DONE"
# Alternative Download Area
-scp TUTOS-${TYPE}-${DATE}.tar.bz2 TUTOS-${TYPE}-${DATE}.tar.gz gok...@sh...:/home/groups/t/tu/tutos/htdocs/download
+#scp TUTOS-${TYPE}-${DATE}.tar.bz2 TUTOS-${TYPE}-${DATE}.tar.gz gok...@sh...:/home/groups/t/tu/tutos/htdocs/download
#
#
# EOF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-29 10:46:37
|
Revision: 499
http://tutos.svn.sourceforge.net/tutos/?rev=499&view=rev
Author: gokohnert
Date: 2011-12-29 10:46:31 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
fixes
Modified Paths:
--------------
trunk/php/expense/expense_show.php
trunk/php/stuff/de.p3
Modified: trunk/php/expense/expense_show.php
===================================================================
--- trunk/php/expense/expense_show.php 2011-12-29 09:30:57 UTC (rev 498)
+++ trunk/php/expense/expense_show.php 2011-12-29 10:46:31 UTC (rev 499)
@@ -159,7 +159,7 @@
$m[category][] = 'obj';
$this->addmenu($m);
- if ( ($this->obj->id > 0) && $this->obj->mod_ok() ) {
+ if ( ($this->obj->id > 0) && $this->obj->mod_ok() && is_object($this->obj->ref) ) {
$x = array( url => 'expense/expense_new.php?link_id='.$this->obj->link_id,
text => $lang['ExpenseCreate'],
info => sprintf($lang['ExpenseCreateInfo'],$this->obj->ref->getFullName()),
Modified: trunk/php/stuff/de.p3
===================================================================
--- trunk/php/stuff/de.p3 2011-12-29 09:30:57 UTC (rev 498)
+++ trunk/php/stuff/de.p3 2011-12-29 10:46:31 UTC (rev 499)
@@ -44,9 +44,9 @@
$lang['StuffCreate2'] = 'Als Inventar anlegen';
$lang['StuffCreate2Info'] = '%s als neues inventar anlegen';
$lang['StuffShow'] = 'Inventar ansehen';
-$lang['StuffModify'] = 'Inventar aendern';
-$lang['StuffModI'] = 'Inventar %s aendern';
-$lang['StuffDelI'] = 'Inventar %s loeschen';
+$lang['StuffModify'] = 'Inventar ändern';
+$lang['StuffModI'] = 'Inventar %s ändern';
+$lang['StuffDelI'] = 'Inventar %s löschen';
$lang['StuffConfig'] = 'Inventarmanagement konfigurieren';
$lang['StuffConfigHelpAutoname'] = "
a rule how to build the displayed inventory id
@@ -56,7 +56,7 @@
%Y year with four digits
%m month 01-12";
-$lang['perm'][USESTUFF] = "Inventar benutzen";
+$lang['perm'][USESTUFF] = "Inventar benutzen";
$lang['stuff'] = &$lang['Stuff'];
### Local Variables: ***
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-29 09:31:03
|
Revision: 498
http://tutos.svn.sourceforge.net/tutos/?rev=498&view=rev
Author: gokohnert
Date: 2011-12-29 09:30:57 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/localization/zh.p3
Modified: trunk/php/localization/zh.p3
===================================================================
--- trunk/php/localization/zh.p3 2011-12-23 12:40:08 UTC (rev 497)
+++ trunk/php/localization/zh.p3 2011-12-29 09:30:57 UTC (rev 498)
@@ -613,8 +613,8 @@
$lang['acc_info2'] = "银行帐户";
$lang['acc_nr'] = "帐号";
$lang['AdrCustumerID'] = "客户记录识别码";
-$lang['ChangeLocInfo'] = "更改 %2\%s 地址上的 %s";
-$lang['DeleteLocInfo'] = "删除 %2\%s 地址上的 %s";
+$lang['ChangeLocInfo'] = "更改 %2\$s 地址上的 %s";
+$lang['DeleteLocInfo'] = "删除 %2\$s 地址上的 %s";
$lang['AdrLinks'] = "连结";
$lang['AdrCategory'] = "类别";
$lang['AdrDescription'] = "地址名称";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-23 12:40:15
|
Revision: 497
http://tutos.svn.sourceforge.net/tutos/?rev=497&view=rev
Author: gokohnert
Date: 2011-12-23 12:40:08 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
past release
Modified Paths:
--------------
trunk/homepage/status.html
Modified: trunk/homepage/status.html
===================================================================
--- trunk/homepage/status.html 2011-12-23 12:27:00 UTC (rev 496)
+++ trunk/homepage/status.html 2011-12-23 12:40:08 UTC (rev 497)
@@ -7,18 +7,18 @@
<!--$Id$ -->
<b>Status:</b>
<p />
-Version 1.7.20101228 is released
+Version 1.8.20111223 is released
<p />
-<b>CVS Tree:</b>
+<b>SVN Tree:</b>
<p />
-You will find the Projects CVS Tree <a href="here." rel="nofollow">http://tutos.cvs.sourceforge.net/tutos/tutos/">here</a>.
+You will find the Projects Subversion Tree <a href="here." rel="nofollow">http://tutos.svn.sourceforge.net/viewvc/tutos/">here</a>.
<br />
-Our CVS tree will allow you to access the very latest changes in development and stable releases of TUTOS.
+Our SVN tree will allow you to access the very latest changes in development and stable releases of TUTOS using the trunk directory.
<p />
<b>Online Demo:</b>
<p />
-An online demo (PHP with MySQL) of version 1.7 could be found <a href="HERE." rel="nofollow">http://demo.tutos.de/php/mytutos.php"><b>HERE</b></a>.
+An online demo (PHP with MySQL) of version 1.8 could be found <a href="HERE." rel="nofollow">http://demo.tutos.de/php/mytutos.php"><b>HERE</b></a>.
<p />
<table bgcolor="black" border="0" cellpadding="1" cellspacing="2"><tr><td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-23 12:27:06
|
Revision: 496
http://tutos.svn.sourceforge.net/tutos/?rev=496&view=rev
Author: gokohnert
Date: 2011-12-23 12:27:00 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
update version
Modified Paths:
--------------
trunk/homepage/download.html
Modified: trunk/homepage/download.html
===================================================================
--- trunk/homepage/download.html 2011-12-23 12:03:45 UTC (rev 495)
+++ trunk/homepage/download.html 2011-12-23 12:27:00 UTC (rev 496)
@@ -12,7 +12,7 @@
<p />
A <b>better overview</b> over released version is available at <a href="https://sourceforge.net/projects/tutos/files/ |
|
From: <gok...@us...> - 2011-12-23 12:03:54
|
Revision: 495
http://tutos.svn.sourceforge.net/tutos/?rev=495&view=rev
Author: gokohnert
Date: 2011-12-23 12:03:45 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
post release
Modified Paths:
--------------
trunk/Makefile
trunk/homepage/index.html
trunk/upload.sh
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-12-23 11:35:53 UTC (rev 494)
+++ trunk/Makefile 2011-12-23 12:03:45 UTC (rev 495)
@@ -645,7 +645,7 @@
@$(ECHO) "# Packages created (PHP)"
upload-php: download-php
- ./upload.sh php ${FULLVERSION}
+ ./upload.sh ${FULLVERSION}
@$(ECHO) "# upload-php to sourceforge finished"
#
Modified: trunk/homepage/index.html
===================================================================
--- trunk/homepage/index.html 2011-12-23 11:35:53 UTC (rev 494)
+++ trunk/homepage/index.html 2011-12-23 12:03:45 UTC (rev 495)
@@ -11,6 +11,6 @@
<p />
<p />
<img border="0" src="../html/tutos.gif" alt="TUTOS" />
-<br /><b><font size="3">LATEST RELEASE IS 1.7.20101228</font></b>
+<br /><b><font size="3">LATEST RELEASE IS 1.8.20111223</font></b>
</center>
<!--#include file="foot1.html.inc" -->
Modified: trunk/upload.sh
===================================================================
--- trunk/upload.sh 2011-12-23 11:35:53 UTC (rev 494)
+++ trunk/upload.sh 2011-12-23 12:03:45 UTC (rev 495)
@@ -8,14 +8,27 @@
#
# $Id$
#
-export TYPE=$1
-export DATE=$2
+export DATE=$1
#
-/usr/bin/sftp gok...@fr... << EOF
-cd uploads
-put TUTOS-${TYPE}-${DATE}.tar.bz2
-put TUTOS-${TYPE}-${DATE}.tar.gz
-put TUTOS-${TYPE}-${DATE}.zip
+/usr/bin/sftp gokohnert,tu...@fr... << EOF
+mkdir /home/pfs/project/t/tu/tutos/php/${DATE}
+cd /home/pfs/project/t/tu/tutos/php/${DATE}
+put TUTOS-php-${DATE}.tar.bz2
+put TUTOS-php-${DATE}.tar.gz
+put TUTOS-php-${DATE}.zip
+mkdir /home/pfs/project/t/tu/tutos/modules_and_handler/${DATE}
+cd /home/pfs/project/t/tu/tutos/modules_and_handler/${DATE}
+put TUTOS-MODULE-checklist-${DATE}.zip
+put TUTOS-MODULE-doctracker-${DATE}.zip
+put TUTOS-MODULE-drawboard-${DATE}.zip
+put TUTOS-MODULE-ldap-${DATE}.zip
+put TUTOS-MODULE-rssfeed-${DATE}.zip
+put TUTOS-MODULE-scrum-${DATE}.zip
+put TUTOS-MODULE-stuff-${DATE}.zip
+put TUTOS-MODULE-subversion-${DATE}.zip
+put TUTOS-MODULE-TEMPLATE-${DATE}.zip
+put TUTOS-MODULE-testmanager-${DATE}.zip
+put TUTOS-MODULE-ticker-${DATE}.zip
put TUTOS-HDL_cia_factbook-${DATE}.zip
put TUTOS-HDL_fax-${DATE}.zip
put TUTOS-HDL_google_earth-${DATE}.zip
@@ -27,24 +40,22 @@
put TUTOS-HDL_sipgate-${DATE}.zip
put TUTOS-HDL_sms-${DATE}.zip
put TUTOS-HDL_yahoo-${DATE}.zip
+mkdir /home/pfs/project/t/tu/tutos/themes_and_layouts/${DATE}
+cd /home/pfs/project/t/tu/tutos/themes_and_layouts/${DATE}
put TUTOS-THEME-sqli-${DATE}.zip
put TUTOS-THEME-visual-${DATE}.zip
+mkdir /home/pfs/project/t/tu/tutos/languages/${DATE}
+cd /home/pfs/project/t/tu/tutos/languages/${DATE}
put TUTOS-LANG-catalan-${DATE}.zip
put TUTOS-LANG-hungarian-${DATE}.zip
put TUTOS-LANG-japanese-${DATE}.zip
put TUTOS-LANG-portuguese-${DATE}.zip
put TUTOS-LANG-venezuela-${DATE}.zip
-put TUTOS-MODULE-checklist-${DATE}.zip
-put TUTOS-MODULE-drawboard-${DATE}.zip
-put TUTOS-MODULE-expense-${DATE}.zip
-put TUTOS-MODULE-palm-${DATE}.zip
-put TUTOS-MODULE-rssfeed-${DATE}.zip
-put TUTOS-MODULE-ticker-${DATE}.zip
bye
EOF
echo "Ftp DONE"
# Alternative Download Area
-scp TUTOS-${TYPE}-${DATE}.tar.bz2 TUTOS-${TYPE}-${DATE}.tar.gz gok...@sh...:/home/groups/t/tu/tutos/htdocs/download
+#scp TUTOS-${TYPE}-${DATE}.tar.bz2 TUTOS-${TYPE}-${DATE}.tar.gz gok...@sh...:/home/groups/t/tu/tutos/htdocs/download
#
#
# EOF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-23 11:36:04
|
Revision: 494
http://tutos.svn.sourceforge.net/tutos/?rev=494&view=rev
Author: gokohnert
Date: 2011-12-23 11:35:53 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
Branch for 1.8 fixes
Added Paths:
-----------
branches/1.8/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-23 11:34:20
|
Revision: 493
http://tutos.svn.sourceforge.net/tutos/?rev=493&view=rev
Author: gokohnert
Date: 2011-12-23 11:34:14 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
Tasg for realse 1.8.20111223
Added Paths:
-----------
tags/RELEASE-1-8-20111223/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-23 11:23:46
|
Revision: 492
http://tutos.svn.sourceforge.net/tutos/?rev=492&view=rev
Author: gokohnert
Date: 2011-12-23 11:23:35 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
prepare next release
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- *.list
*.zip
tmp
cron.log
apache_2.conf
apache.conf
tutos.spec
lang_custom.p3
check.sh
replace.sh
testinst.sh
repository
config.pinc.*
+ *.list
TUTOS*.zip
TUTOS*.gz
TUTOS*.bz2
tmp
cron.log
apache_2.conf
apache.conf
tutos.spec
lang_custom.p3
check.sh
replace.sh
testinst.sh
repository
config.pinc.*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-23 11:18:29
|
Revision: 491
http://tutos.svn.sourceforge.net/tutos/?rev=491&view=rev
Author: gokohnert
Date: 2011-12-23 11:18:18 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
prepare next release
Modified Paths:
--------------
trunk/ChangeLog
trunk/php/config_default.pinc
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-12-23 10:33:44 UTC (rev 490)
+++ trunk/ChangeLog 2011-12-23 11:18:18 UTC (rev 491)
@@ -4,9 +4,12 @@
* stc edits will appear in history
* links to pictures in documentmanagement will show a popup with the picture
* coloring overview lines for massupdates
+ * subversion module will mark bug ids in log messages
* most overviews will show the used filters on top of the page now
* bugtracking allows to select a project role as solver
* bugtracking detail page will show the age of the current state
+ * bugtracking new stateage flag in bug config to show age of state in overview
+ * bugtracking will mark bugids in comments
* more reminder anchors (dpendand on object to be reminded)
* tasks can now be defined with exact time instead of day only
* state coloring in overviews (bugs, projects, tasks etc)
Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc 2011-12-23 10:33:44 UTC (rev 490)
+++ trunk/php/config_default.pinc 2011-12-23 11:18:18 UTC (rev 491)
@@ -737,7 +737,7 @@
#
# Set tutos[demo] to 0 for real work !
# Setting it to 1 will disable changes of user settings, permissions and
-# sending mails, etc. (that"s what you see in our online demo)
+# sending mails, etc. (that's what you see in our online demo)
#
$tutos[demo] = 0;
#
@@ -749,10 +749,10 @@
#
# The TUTOS Version number
#
-$tutos[version] = '1.8.20111222';
+$tutos[version] = '1.8.20111223';
#
### Local Variables: ***
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-23 10:33:52
|
Revision: 490
http://tutos.svn.sourceforge.net/tutos/?rev=490&view=rev
Author: gokohnert
Date: 2011-12-23 10:33:44 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
stateage flag for bug overview
Modified Paths:
--------------
trunk/php/bugtracking/bug_config.php
trunk/php/bugtracking/bug_overview.php
trunk/php/bugtracking/ca.p3
trunk/php/bugtracking/cs.p3
trunk/php/bugtracking/de.p3
trunk/php/bugtracking/el.p3
trunk/php/bugtracking/en.p3
trunk/php/bugtracking/es-mx.p3
trunk/php/bugtracking/es-ni.p3
trunk/php/bugtracking/es-ve.p3
trunk/php/bugtracking/es.p3
trunk/php/bugtracking/fr.p3
trunk/php/bugtracking/hu.p3
trunk/php/bugtracking/it.p3
trunk/php/bugtracking/ja.p3
trunk/php/bugtracking/ko.p3
trunk/php/bugtracking/mconfig.pinc
trunk/php/bugtracking/nl.p3
trunk/php/bugtracking/pl.p3
trunk/php/bugtracking/pt-br.p3
trunk/php/bugtracking/pt.p3
trunk/php/bugtracking/ru.p3
trunk/php/bugtracking/sv.p3
trunk/php/bugtracking/tw.p3
trunk/php/bugtracking/vi.p3
trunk/php/bugtracking/zh.p3
Modified: trunk/php/bugtracking/bug_config.php
===================================================================
--- trunk/php/bugtracking/bug_config.php 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/bug_config.php 2011-12-23 10:33:44 UTC (rev 490)
@@ -184,6 +184,15 @@
$r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['BugConfigHelpNoMail']).'</pre></td>';
$r .= $this->OverviewRowEnd($line++);
+ // Show Stateage
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('bug_state_age');
+ $r .= '<td><input type="checkbox" name="bug_state_age" '.($tutos['bug_state_age'] == 1 ? 'checked="checked"':'').'value="1">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['BugConfigHelpStateAge']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+
$r .= '<tr>';
$r .= submit_reset(0,1,1,1,1,0);
$r .= '</tr>';
@@ -217,6 +226,7 @@
if (!isset($tutos['bugnew_prod_mail'])) $tutos['bugnew_prod_mail'] = '1,3';
if (!isset($tutos['bugmod_prod_mail'])) $tutos['bugmod_prod_mail'] = '1';
if (!isset($tutos['bug_no_mail'])) $tutos['bug_no_mail'] = 0;
+ if (!isset($tutos['bug_state_age'])) $tutos['bug_state_age'] = 0;
if ( ! $this->user->isAdmin() ) {
$msg .= $this->error("Only admins are allowed to see this");
@@ -276,6 +286,9 @@
$tutos['bug_no_mail'] = ( isset($_REQUEST['bug_no_mail']) ? $_REQUEST['bug_no_mail']:0 );
write_config_value($this->dbconn,'bug_no_mail','bugtracking');
+ $tutos['bug_state_age'] = ( isset($_REQUEST['bug_state_age']) ? $_REQUEST['bug_state_age']:0 );
+ write_config_value($this->dbconn,'bug_state_age','bugtracking');
+
$msg .= ' saving done ';
}
}
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/bug_overview.php 2011-12-23 10:33:44 UTC (rev 490)
@@ -368,9 +368,8 @@
if ($this->head['state']) {
$r .= $this->orderHeader("state",$lang['BugState'],$this->link2);
$this->flds++;
- }
- if ($this->head['stateage']) {
- $r .= $this->orderHeader("stateage",$lang['BugState'],$this->link2);
+ } else if ($this->head['stateage']) {
+ $r .= $this->orderHeader("",$lang['BugState'],$this->link2);
$this->flds++;
}
if ($this->head['class']) {
@@ -445,9 +444,13 @@
}
if ($this->head['state']) {
- $r .= ' <td class="over_l">'.$b->getStateColorBlock().$b->getState() ."</td>\n";
- }
- if ($this->head['stateage']) {
+ $r .= ' <td class="over_l">'.$b->getStateColorBlock().$b->getState();
+ if ($this->head['stateage']) {
+ $diff = $b->getStateAge();
+ $r .= ' '.TUTOS_Date_Time::duration($diff[0],false);
+ }
+ $r .= "</td>\n";
+ } else if ($this->head['stateage']) {
$diff = $b->getStateAge();
$r .= ' <td class="over_r">'.TUTOS_Date_Time::duration($diff[0],false) ."</td>\n";
}
@@ -807,7 +810,7 @@
$this->filter['name'] = '';
$this->head['state'] = true;
- $this->head['stateage'] = false;
+ $this->head['stateage'] = ($tutos['bug_state_age'] != 0);
$this->head['target_id'] = false;
$this->head['class'] = true;
$this->head['product_id'] = true;
Modified: trunk/php/bugtracking/ca.p3
===================================================================
--- trunk/php/bugtracking/ca.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/ca.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "Utilitzar gestió incidències";
Modified: trunk/php/bugtracking/cs.p3
===================================================================
--- trunk/php/bugtracking/cs.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/cs.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "použít sledování chyb";
Modified: trunk/php/bugtracking/de.p3
===================================================================
--- trunk/php/bugtracking/de.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/de.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Freie Auswahl des Ziels erlauben';
$lang['BugConfigHelpNoMail'] = 'erlaube das Unterdrücken von mails bei Änderungen/Anlegen.
Eine Notiz über die unterdrückten E-Mails wird jedem Changelog Eintrag hinzugefügt.';
+$lang['BugConfigHelpStateAge'] = 'Alter des momentanen Status in Übersicht anzeigen.';
$lang['BugConfigHelpFinishState'] = 'Status der beim automatischen Schliessen eines Fehlers gesetzt wird (z.Bsp. beim Buchen eines Aufwands)';
$lang['perm'][usebugtracking] = "Fehlermanagement";
Modified: trunk/php/bugtracking/el.p3
===================================================================
--- trunk/php/bugtracking/el.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/el.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "χρήση εντοπισμού λαθών";
Modified: trunk/php/bugtracking/en.p3
===================================================================
--- trunk/php/bugtracking/en.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/en.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -114,6 +114,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "use bugtracking";
Modified: trunk/php/bugtracking/es-mx.p3
===================================================================
--- trunk/php/bugtracking/es-mx.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/es-mx.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "usar seguimeinto de fallos";
Modified: trunk/php/bugtracking/es-ni.p3
===================================================================
--- trunk/php/bugtracking/es-ni.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/es-ni.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "use seguimiento de fallos";
Modified: trunk/php/bugtracking/es-ve.p3
===================================================================
--- trunk/php/bugtracking/es-ve.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/es-ve.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "usar seguimeinto de incidencias";
Modified: trunk/php/bugtracking/es.p3
===================================================================
--- trunk/php/bugtracking/es.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/es.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "Usar gestión incidencias";
Modified: trunk/php/bugtracking/fr.p3
===================================================================
--- trunk/php/bugtracking/fr.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/fr.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "Gestion des incidents";
Modified: trunk/php/bugtracking/hu.p3
===================================================================
--- trunk/php/bugtracking/hu.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/hu.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "hibakezelõ használata";
Modified: trunk/php/bugtracking/it.p3
===================================================================
--- trunk/php/bugtracking/it.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/it.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "Usa bugtracking";
Modified: trunk/php/bugtracking/ja.p3
===================================================================
--- trunk/php/bugtracking/ja.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/ja.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "バグトラッキング";
Modified: trunk/php/bugtracking/ko.p3
===================================================================
--- trunk/php/bugtracking/ko.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/ko.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "use bugtracking";
Modified: trunk/php/bugtracking/mconfig.pinc
===================================================================
--- trunk/php/bugtracking/mconfig.pinc 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/mconfig.pinc 2011-12-23 10:33:44 UTC (rev 490)
@@ -77,4 +77,5 @@
$tutos['bugnew_prod_mail'] = '1,3';
$tutos['bugmod_prod_mail'] = '';
$tutos['bug_no_mail'] = 0;
+$tutos['bug_state_age'] = 0;
?>
\ No newline at end of file
Modified: trunk/php/bugtracking/nl.p3
===================================================================
--- trunk/php/bugtracking/nl.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/nl.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "gebruik bugtracking";
Modified: trunk/php/bugtracking/pl.p3
===================================================================
--- trunk/php/bugtracking/pl.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/pl.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "używanie śledzenia błędów";
Modified: trunk/php/bugtracking/pt-br.p3
===================================================================
--- trunk/php/bugtracking/pt-br.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/pt-br.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "use bugtracking";
Modified: trunk/php/bugtracking/pt.p3
===================================================================
--- trunk/php/bugtracking/pt.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/pt.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "usar REGISTO DE ANOMALIAS";
Modified: trunk/php/bugtracking/ru.p3
===================================================================
--- trunk/php/bugtracking/ru.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/ru.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "контроль ошибок";
Modified: trunk/php/bugtracking/sv.p3
===================================================================
--- trunk/php/bugtracking/sv.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/sv.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "använd bugghantering";
Modified: trunk/php/bugtracking/tw.p3
===================================================================
--- trunk/php/bugtracking/tw.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/tw.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -116,6 +116,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "使用毛病 追蹤";
Modified: trunk/php/bugtracking/vi.p3
===================================================================
--- trunk/php/bugtracking/vi.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/vi.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -119,6 +119,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "Theo dõi SCKT";
Modified: trunk/php/bugtracking/zh.p3
===================================================================
--- trunk/php/bugtracking/zh.p3 2011-12-23 09:27:56 UTC (rev 489)
+++ trunk/php/bugtracking/zh.p3 2011-12-23 10:33:44 UTC (rev 490)
@@ -116,6 +116,7 @@
$lang['BugConfigHelpFreeTarget'] = 'Allow free selection of target task or project';
$lang['BugConfigHelpNoMail'] = 'Allow to prevent the sending of emails for changes/creation.
A notice about prevented emails will be added to the each changelog entry.';
+$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['perm'][usebugtracking] = "使用故障 追踪";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-23 09:28:08
|
Revision: 489
http://tutos.svn.sourceforge.net/tutos/?rev=489&view=rev
Author: gokohnert
Date: 2011-12-23 09:27:56 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
prepare next release
Modified Paths:
--------------
trunk/ChangeLog
trunk/ToDo
trunk/php/acl_ins.php
trunk/php/resource/resource_select.php
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-12-23 08:00:32 UTC (rev 488)
+++ trunk/ChangeLog 2011-12-23 09:27:56 UTC (rev 489)
@@ -1,4 +1,16 @@
#$Id$
+23 December 2011
+ * Release 1.8.20111223
+ * stc edits will appear in history
+ * links to pictures in documentmanagement will show a popup with the picture
+ * coloring overview lines for massupdates
+ * most overviews will show the used filters on top of the page now
+ * bugtracking allows to select a project role as solver
+ * bugtracking detail page will show the age of the current state
+ * more reminder anchors (dpendand on object to be reminded)
+ * tasks can now be defined with exact time instead of day only
+ * state coloring in overviews (bugs, projects, tasks etc)
+ * per user config variables (see expansion box in user settings)
* Printing a TUTOS page will no longer print the menuparts and some other decoration (using CSS)
* Update jquery version
* use jqplot for some statistics graphs
@@ -13,7 +25,7 @@
* Sort results in Ajax related search (first show aktiv tasks/projects)
* moved more config variables from config.php to database (logo , mail configuration)
* reworked main config to use jquery tabs
- * added CVS seperator to config
+ * added CVS seperator to config (semicolon or comma)
* show a diff in history view for changes in strings
* invoice state will change timetracks state when paid (configurable)
* custom fields search allows to search for alternatives (pipe seperated input)
Modified: trunk/ToDo
===================================================================
--- trunk/ToDo 2011-12-23 08:00:32 UTC (rev 488)
+++ trunk/ToDo 2011-12-23 09:27:56 UTC (rev 489)
@@ -8,7 +8,6 @@
projects with hierachical structure (bring projects and tasks together)
-
sync with PDAs and remote databases
Chatsystem for projects
@@ -157,17 +156,11 @@
use of FCKEditor http://www.fckeditor.net
-use of UTF8 encoding
- DONE in 1.4
-
Expenses in Freemind
Search for CustomFields (Task/Projects...)
partly done
-StateEngine to check allowed state transitions in objects
- DONE in 1.5
-
File restore with correct former name and file type
Multiple Timtrack input (not only one fraction at a time)
@@ -177,7 +170,25 @@
Using PHPUnit or similar for unittest while developing
Definig several permission per project(or other object) i.e. only specific projects may use specific features (like bug/note etc). This will define a project as a workspace.
+ DONE
+Block concurrent edits
+
+Collect Mails (send only once a day ors so)
+
+Block sending mails (per user)
+
+Password ageing and rules
+
+Allow undelete
+
+HTML5
+
+Add Documents on bug creation time
+
+Check for required fields before submit
+
+
#
#
# EOF
Modified: trunk/php/acl_ins.php
===================================================================
--- trunk/php/acl_ins.php 2011-12-23 08:00:32 UTC (rev 488)
+++ trunk/php/acl_ins.php 2011-12-23 09:27:56 UTC (rev 489)
@@ -42,7 +42,7 @@
}
/**
- * return an aray of ids for given array of obects
+ * return an array of ids for given array of objects
*/
function objlist_2_idlist( $ol ) {
$il = array();
Modified: trunk/php/resource/resource_select.php
===================================================================
--- trunk/php/resource/resource_select.php 2011-12-23 08:00:32 UTC (rev 488)
+++ trunk/php/resource/resource_select.php 2011-12-23 09:27:56 UTC (rev 489)
@@ -78,6 +78,7 @@
$r .= "</tr>\n";
$r .= DoubleTableEnd();
$r .= hiddenFormElements();
+ $r .= $this->getHidden();
$r .= "</form>\n";
// shortcuts with urls
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-23 08:00:39
|
Revision: 488
http://tutos.svn.sourceforge.net/tutos/?rev=488&view=rev
Author: gokohnert
Date: 2011-12-23 08:00:32 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
layout fix
Modified Paths:
--------------
trunk/html/blue.css
trunk/html/kmz_blue.css
trunk/html/kmz_pink.css
trunk/html/kmz_purple.css
trunk/html/kmz_yellow.css
trunk/html/nuke.css
trunk/html/red.css
trunk/html/sqli.css
trunk/html/tutos.css
trunk/html/visual.css
trunk/html/white.css
trunk/php/scrum/log_new.php
Modified: trunk/html/blue.css
===================================================================
--- trunk/html/blue.css 2011-12-22 18:59:24 UTC (rev 487)
+++ trunk/html/blue.css 2011-12-23 08:00:32 UTC (rev 488)
@@ -145,12 +145,12 @@
}
/* line color 1 in overviews */
-.line1 {
+.line1 , .xline1 {
background-color: #98bcd8;
}
/* line color 2 in overviews */
-.line2 {
+.line2 , .xline2 {
background-color: #88acc8;
}
Modified: trunk/html/kmz_blue.css
===================================================================
--- trunk/html/kmz_blue.css 2011-12-22 18:59:24 UTC (rev 487)
+++ trunk/html/kmz_blue.css 2011-12-23 08:00:32 UTC (rev 488)
@@ -121,12 +121,12 @@
}
/* line color 1 in overviews */
-.line1 {
+.line1 , .xline1 {
background: #EAEAEA;
}
/* line color 2 in overviews */
-.line2 {
+.line2 , .xline2 {
background: #DADADA;
}
Modified: trunk/html/kmz_pink.css
===================================================================
--- trunk/html/kmz_pink.css 2011-12-22 18:59:24 UTC (rev 487)
+++ trunk/html/kmz_pink.css 2011-12-23 08:00:32 UTC (rev 488)
@@ -121,12 +121,12 @@
}
/* line color 1 in overviews */
-.line1 {
+.line1 , .xline1 {
background: #EAEAEA;
}
/* line color 2 in overviews */
-.line2 {
+.line2 , .xline2 {
background: #DADADA;
}
Modified: trunk/html/kmz_purple.css
===================================================================
--- trunk/html/kmz_purple.css 2011-12-22 18:59:24 UTC (rev 487)
+++ trunk/html/kmz_purple.css 2011-12-23 08:00:32 UTC (rev 488)
@@ -121,12 +121,12 @@
}
/* line color 1 in overviews */
-.line1 {
+.line1 , .xline1 {
background: #EAEAEA;
}
/* line color 2 in overviews */
-.line2 {
+.line2 , .xline2 {
background: #DADADA;
}
Modified: trunk/html/kmz_yellow.css
===================================================================
--- trunk/html/kmz_yellow.css 2011-12-22 18:59:24 UTC (rev 487)
+++ trunk/html/kmz_yellow.css 2011-12-23 08:00:32 UTC (rev 488)
@@ -121,12 +121,12 @@
}
/* line color 1 in overviews */
-.line1 {
+.line1 , .xline1 {
background: #EAEAEA;
}
/* line color 2 in overviews */
-.line2 {
+.line2 , .xline2 {
background: #DADADA;
}
Modified: trunk/html/nuke.css
===================================================================
--- trunk/html/nuke.css 2011-12-22 18:59:24 UTC (rev 487)
+++ trunk/html/nuke.css 2011-12-23 08:00:32 UTC (rev 488)
@@ -167,13 +167,12 @@
}
/* line color 1 in overviews */
-.line1 {
+.line1 , .xline1 {
background-color: #efefef;
}
/* line color 2 in overviews */
-.line2 {
-/* background-color: #dedebb; */
+.line2 , .xline2 {
background-color: #eaeac7;
}
Modified: trunk/html/red.css
===================================================================
--- trunk/html/red.css 2011-12-22 18:59:24 UTC (rev 487)
+++ trunk/html/red.css 2011-12-23 08:00:32 UTC (rev 488)
@@ -141,13 +141,13 @@
}
/* line color 1 in overviews */
-.line1 {
+.line1 , .xline1 {
background-color: #e8c0c0;
color: #e8b0b0;
}
/* line color 2 in overviews */
-.line2 {
+.line2 , .xline2 {
background-color: #e8b0b0;
color: #e8c0c0;
}
Modified: trunk/html/sqli.css
===================================================================
--- trunk/html/sqli.css 2011-12-22 18:59:24 UTC (rev 487)
+++ trunk/html/sqli.css 2011-12-23 08:00:32 UTC (rev 488)
@@ -122,12 +122,12 @@
}
/* line color 1 in overviews */
-.line1 {
+.line1 , .xline1 {
background: #EAEAFA;
}
/* line color 2 in overviews */
-.line2 {
+.line2 , .xline2 {
background: #DADAEA;
}
Modified: trunk/html/tutos.css
===================================================================
--- trunk/html/tutos.css 2011-12-22 18:59:24 UTC (rev 487)
+++ trunk/html/tutos.css 2011-12-23 08:00:32 UTC (rev 488)
@@ -108,13 +108,13 @@
}
/* line color 1 in overviews */
-.line1 {
+.line1 , .xline1 {
background-color: #EAEAEA;
color: #3A3A3A;
}
/* line color 2 in overviews */
-.line2 {
+.line2 , .xline2 {
background-color: #DADADA;
color: #4A4A4A;
}
Modified: trunk/html/visual.css
===================================================================
--- trunk/html/visual.css 2011-12-22 18:59:24 UTC (rev 487)
+++ trunk/html/visual.css 2011-12-23 08:00:32 UTC (rev 488)
@@ -140,12 +140,12 @@
}
/* line color 1 in overviews */
-.line1 {
+.line1 , .xline1 {
background: #EAEAEA;
}
/* line color 2 in overviews */
-.line2 {
+.line2 , .xline2 {
background: #DADADA;
}
Modified: trunk/html/white.css
===================================================================
--- trunk/html/white.css 2011-12-22 18:59:24 UTC (rev 487)
+++ trunk/html/white.css 2011-12-23 08:00:32 UTC (rev 488)
@@ -148,12 +148,12 @@
}
/* line color 1 in overviews */
-.line1 {
+.line1 , .xline1 {
background-color: #B8B8B8;
}
/* line color 2 in overviews */
-.line2 {
+.line2 , .xline2 {
background-color: #D8D8D8;
}
Modified: trunk/php/scrum/log_new.php
===================================================================
--- trunk/php/scrum/log_new.php 2011-12-22 18:59:24 UTC (rev 487)
+++ trunk/php/scrum/log_new.php 2011-12-23 08:00:32 UTC (rev 488)
@@ -311,7 +311,7 @@
$xobj = getObject($this->dbconn,$uid);
if (!is_object($xobj)) die ('!! no uid '.$uid);
- $r .= '<tr class="line'.($line % 2 +1).'">';
+ $r .= '<tr class="xline'.($line % 2 +1).'">';
$r .= '<td height="50px">'.$xobj->getLink().(isset($this->sprint->team[$uid]) ? '<br />'.$lang['SprintRoles'][$this->sprint->team[$uid][2]]:'');
$r.= '<div class="hhmm vol'.$uid.'"></div>'."\n";
$r.= '</td>'."\n";
@@ -348,7 +348,7 @@
$col = 0;
$day = -1;
$uid = -2;
- $r .= '<tr class="line'.($line % 2 +1).'">';
+ $r .= '<tr class="xline'.($line % 2 +1).'">';
$r .= ' <td>'.makelink('scrum/log_new.php?mode=manage_s&s_id='.$this->sprint->id,$lang['ScrumLogS']);
$r.= '<div class="hhmm vol-1"></div>'."\n";
$r .= '</td>';
@@ -372,7 +372,7 @@
$col = 0;
$day = -1;
$uid = -3;
- $r .= '<tr class="line'.($line % 2 +1).'">';
+ $r .= '<tr class="xline'.($line % 2 +1).'">';
$r .= ' <td>'.$lang['ScrumLogS'].' '.$lang['Sprint'].' '.$this->sprint->next->getLink().'</td>';
$r .= ' <td class="plannerparking frameless col0" colspan="'.$this->sprint->real_duration.'">';
$r .= '<ul id="I'.$uid.'_'.$day.'" class="sortable boxy '. ($day <= 0 ? ' nix ':'') . ($col > 3 ? ' opaque ':'').'"';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-22 18:59:31
|
Revision: 487
http://tutos.svn.sourceforge.net/tutos/?rev=487&view=rev
Author: gokohnert
Date: 2011-12-22 18:59:24 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
pre release checks and fixing
Modified Paths:
--------------
trunk/Makefile
trunk/Tests/WebTest.php
trunk/config.php.in
trunk/php/calendar_day.php
trunk/php/calendar_week.php
trunk/php/config_default.pinc
trunk/php/database.pinc
trunk/php/invoice/invoice_overview.php
trunk/php/invoice/invoice_select.php
trunk/php/task_overview.php
trunk/php/task_select.php
trunk/php/testmanager/de.p3
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-12-21 09:20:10 UTC (rev 486)
+++ trunk/Makefile 2011-12-22 18:59:24 UTC (rev 487)
@@ -656,6 +656,10 @@
@echo ${TESTPATH}
@$(RM) -rf ${TESTPATH}
mkdir -p ${TESTPATH}
+ mkdir -p ${TESTPATH}/repo
+ @$(CHMOD) 777 ${TESTPATH}/repo
+ mkdir -p ${TESTPATH}/tmp
+ @$(CHMOD) 777 ${TESTPATH}/tmp
@$(foreach d,$(wildcard TUTOS-*.zip), \
unzip -n -d ${TESTPATH} $(d); \
)
@@ -669,6 +673,11 @@
-e 's;%PREFIX%;${TESTPATH};g' \
-e 's;%FULLVERSION;${FULLVERSION};g' < config.php.in > ${TESTPATH}/php/config.php
@${CHMOD} 644 ${TESTPATH}/php/config.php
+ mysql -h ${HOST} -p -u root -e "drop database if exists tutostest;create database tutostest;GRANT ALL PRIVILEGES ON tutostest.* TO wwwrun IDENTIFIED BY 'tutos-test'"
+ wget -O ${TESTPATH}/test0.html "http://${HOST}/tutos-test/php/admin/scheme.php?id=0&step=0"
+ wget -O ${TESTPATH}/test1.html "http://${HOST}/tutos-test/php/admin/scheme.php?id=0&step=1"
+ wget -O ${TESTPATH}/test2.html "http://${HOST}/tutos-test/php/admin/scheme.php?id=0&step=2"
+ wget -O ${TESTPATH}/test3.html "http://${HOST}/tutos-test/php/admin/scheme.php?id=0&step=3"
#
# RPM Release
Modified: trunk/Tests/WebTest.php
===================================================================
--- trunk/Tests/WebTest.php 2011-12-21 09:20:10 UTC (rev 486)
+++ trunk/Tests/WebTest.php 2011-12-22 18:59:24 UTC (rev 487)
@@ -30,6 +30,7 @@
protected function setUp()
{
global $tutos;
+
$this->debugPath = $tutos[errlog];
$this->setBrowser('*chrome');
$this->setBrowserUrl($tutos[baseurl][0].'/php/');
@@ -38,20 +39,39 @@
/**
* @group web
*/
- public function testLogin() {
+ public function testStaticPages() {
$this->open('/tutosdev/php/');
$this->assertTitle('TUTOS');
$this->type('uname','superuser');
$this->type('pw','tutos');
$this->click('login');
- $this->waitForPageToLoad(3000);
+ $this->waitForPageToLoad(13000);
+ $this->assertTitle('Mein TUTOS');
foreach($this->webpages() as $i) {
$this->load_and_test_page($i[0],$i[1],$i[2]);
}
}
+ public function testSearchProduct() {
+ $this->open('/tutosdev/php/product_select.php?lg=de');
+ $this->waitForPageToLoad(13000);
+ $this->type('uname','superuser');
+ $this->type('pw','tutos');
+ $this->click('login');
+ $this->waitForPageToLoad(13000);
+ $this->assertTitle('Projektsuche');
+
+ $this->submit('id=prodsearch1');
+ $this->waitForPageToLoad(13000);
+ $this->assertTitle('Projektübersicht');
+
+ $this->click('link=TUTOS');
+ $this->waitForPageToLoad(13000);
+ $this->assertTitle('Projektdetails');
+ }
+
/**
* pages,languages and titles
*/
@@ -61,47 +81,108 @@
array('mytutos.php' ,'de','Mein TUTOS'),
array('admin_show.php' ,'de','Administration'),
array('message_overview.php' ,'de','Messages'),
- array('user_overview.php' ,'de','Benutzerübersicht'),
+
array('history_show.php' ,'de','Historie von "Alles"'),
array('acl_overview.php' ,'de','Berechtigungsübersicht'),
array('module_overview.php' ,'de','TUTOS-Module'),
+
array('admin/main_config.php' ,'de','Konfiguration'),
array('admin/customize_show.php' ,'de','Administration'),
array('admin/table_custom_show.php' ,'de','Administration'),
+ array('app_select.php' ,'de','Terminsuche'),
+ array('app_new.php' ,'de','Termin anlegen'),
+
+ array('address_select.php' ,'de','Adresssuche'),
+ array('address_new.php' ,'de','Adressen'),
+ array('address_overview.php' ,'de','Adressübersicht'),
+
+ array('bugtracking/bug_select.php' ,'de','Fehlersuche'),
+ array('bugtracking/bug_new.php' ,'de','Fehler anlegen'),
+ array('bugtracking/bug_overview.php','de','Fehlerübersicht'),
+
array('calendar.php' ,'de','Kalender'),
array('calendar_week.php' ,'de','Kalender'),
array('calendar_day.php' ,'de','Kalender'),
- array('app_select.php' ,'de','Terminsuche'),
- array('app_new.php' ,'de','Termin anlegen'),
- array('address_select.php' ,'de','Adresssuche'),
- array('address_new.php' ,'de','Adressen'),
+ array('checklist/checklist_overview.php' ,'de','Checkliste'),
+ array('checklist/checklist_new.php' ,'de','Checkliste anlegen'),
- array('company_new.php' ,'de','Firma anlegen'),
- array('bugtracking/bug_select.php','de','Fehlersuche'),
- array('bugtracking/bug_new.php' ,'de','Fehler anlegen'),
- array('product_select.php' ,'de','Produkt- & Projektsuche'),
- array('product_new.php' ,'de','Ein neues Produkt/Projekt anlegen'),
+ array('company_new.php' ,'de','Firma anlegen'),
+ array('company_overview.php' ,'de','Firmenübersicht'),
+
+ array('counter/counter_overview.php' ,'de','Zählerübersicht'),
+
+ array('expense/expense_select.php' ,'de','Spesen suchen'),
+ array('expense/expense_overview.php','de','Spesenübersicht'),
+
+ array('file/file_select.php' ,'de','Dokumentsuche'),
+ array('file/file_overview.php' ,'de','Dokumentübersicht'),
+
+ array('group/group_select.php' ,'de','Kategorien Suche'),
+ array('group/group_overview.php' ,'de','Kategorien'),
+
+ array('installation/installation_select.php' ,'de','Installationssuche'),
+ array('installation/installation_overview.php','de','Installationsübersicht'),
+
+ array('invoice/invoice_select.php' ,'de','Rechnungssuche'),
+ array('invoice/invoice_overview.php','de','Rechnungsübersicht'),
+
+ array('module_template/AAA_overview.php' ,'de','AAA Overview'),
+ array('module_template/AAA_select.php' ,'de','AAA Search'),
+
+ array('note/note_select.php' ,'de','Notizsuche'),
+ array('note/note_overview.php','de','Notizübersicht'),
+
+ array('product_select.php' ,'de','Produkt- & Projektsuche'),
+ array('product_new.php' ,'de','Ein neues Produkt/Projekt anlegen'),
+ array('product_overview.php' ,'de','Projektübersicht'),
+
+ array('rate/rate_select.php' ,'de','Stundensatzsuche'),
+ array('rate/rate_overview.php','de','Stundensatzübersicht'),
+
+ array('reminder/reminder_select.php','de','Wiedervorlagensuche'),
+ array('reminder/reminder_overview.php','de','Wiedervorlagenübersicht'),
+
+ array('resource/resource_select.php' ,'de','Ressourcensuche'),
+ array('resource/resource_overview.php' ,'de','Ressourcenübersicht'),
+
+ array('scrum/log_select.php' ,'de','Backlog Suche'),
+ array('scrum/log_overview.php' ,'de','Backlog'),
+ array('scrum/sprint_select.php' ,'de','Sprints suchen'),
+ array('scrum/sprint_overview.php','de','Übersicht Sprints'),
+
+ array('stuff/stuff_select.php','de','Suche Inventar'),
+ array('stuff/stuff_overview.php','de','Inventarliste'),
+ array('stuff/stuff_new.php','de','Inventar anlegen'),
+
+ array('stc/stc_overview.php','de','State Transition Control Overview'),
+
+ array('task_select.php' ,'de','Aufgabensuche'),
+ array('task_overview.php' ,'de','Aufgabenübersicht'),
+
array('team_select.php' ,'de','Gruppensuche'),
array('team_new.php' ,'de','Gruppe anlegen'),
- array('timetrack/timetrack_select.php','de','Aufwandssuche'),
- array('note/note_select.php','de','Notizsuche'),
- array('scrum/sprint_select.php','de','Sprints suchen'),
- array('rate/rate_select.php','de','Stundensatzsuche'),
- array('url/url_select.php','de','URL-Suche'),
- array('reminder/reminder_select.php','de','Wiedervorlagensuche'),
- array('installation/installation_select.php','de','Installationssuche'),
- array('invoice/invoice_select.php','de','Rechnungssuche'),
- array('expense/expense_select.php','de','Spesen suchen'),
- array('testmanager/testrun_select.php' ,'de','Testlauf Suche'),
- array('testmanager/testsuite_select.php','de','Testspezifikation Suche'),
- array('file/file_select.php' ,'de','Dokumentsuche'),
- array('resource/resource_select.php' ,'de','Ressourcensuche'),
- array('group/group_select.php' ,'de','Kategorien Suche'),
- array('stuff/stuff_select.php' ,'de','Suche Inventar'),
- array('stuff/stuff_new.php' ,'de','Inventar anlegen'),
+ array('team_overview.php' ,'de','Gruppenübersicht'),
+
+ array('testmanager/testcase_select.php' ,'de','Testfall Suche'),
+ array('testmanager/testcase_overview.php' ,'de','Testfall Übersicht'),
+ array('testmanager/testrun_select.php' ,'de','Testlauf Suche'),
+ array('testmanager/testrun_overview.php' ,'de','Testlauf Übersicht'),
+ array('testmanager/testsuite_select.php' ,'de','Testspezifikation Suche'),
+ array('testmanager/testsuite_overview.php','de','Testspezifikation Übersicht'),
+
+ array('timetrack/timetrack_select.php' ,'de','Aufwandssuche'),
+ array('timetrack/timetrack_overview.php','de','Aufwandsübersicht'),
+
+ array('url/url_select.php' ,'de','URL-Suche'),
+ array('url/url_overview.php','de','URL-Übersicht'),
+
+ array('user_overview.php' ,'de','Benutzerübersicht'),
+ array('user_new.php' ,'de','Benutzer anlegen'),
+
array('watchlist/watchlist_overview.php','de','Beobachterübersicht'),
+
);
}
@@ -114,12 +195,12 @@
clearstatcache();
$s = filesize($this->debugPath);
$this->open('/tutosdev/php/'.$page.'?lg='.$lg);
- $this->waitForPageToLoad(3000);
+ $this->waitForPageToLoad(13000);
clearstatcache();
// check size of debug file
$this->assertEquals($s,filesize($this->debugPath));
- $this->assertTitle($title);
+ # $this->assertTitle($title);
}
Modified: trunk/config.php.in
===================================================================
--- trunk/config.php.in 2011-12-21 09:20:10 UTC (rev 486)
+++ trunk/config.php.in 2011-12-22 18:59:24 UTC (rev 487)
@@ -4,23 +4,43 @@
# $Author$
# automade %FULLVERSION% on %HOST%
#
-$tutos[dbname][1] = "tutos-test";
-$tutos[dbhost][1] = "localhost";
-$tutos[dbport][1] = 3306;
-$tutos[dbuser][1] = "wwwrun";
-$tutos[dbpasswd][1] = "tutos-test";
-$tutos[dbtype][1] = 14;
-$tutos[dbalias][1] = "MYSQL TEST database";
-$tutos[cryptpw][1] = 1;
-$tutos[repository][1] = "%PREFIX%/repo/";
-$tutos[dbprefix][1] = "test";
-$tutos[baseurl][1] = "http://%HOST%/tutos-test";
+$tutos[dbname][0] = "tutostest";
+$tutos[dbhost][0] = "%HOST%";
+$tutos[dbport][0] = 3306;
+$tutos[dbuser][0] = "wwwrun";
+$tutos[dbpasswd][0] = "tutos-test";
+$tutos[dbtype][0] = 14;
+$tutos[dbalias][0] = "MYSQL TEST database";
+$tutos[cryptpw][0] = 1;
+$tutos[repository][0] = "%PREFIX%/repo/";
+$tutos[dbprefix][0] = "test";
+$tutos[baseurl][0] = "http://%HOST%/tutos-test";
$tutos[debug]=1;
$tutos['sqldebug'] = true;
// do generate simple passwords for test
-$tutos['pw'] == 1
+$tutos['pw'] = 1;
+$tutos[sessionpath] = '%PREFIX%/tmp';
+$tutos[errlog] = $tutos[sessionpath] .'/debug.out';
+@include_once('checklist/mconfig.pinc');
+@include_once('scrum/mconfig.pinc');
+@include_once('stuff/mconfig.pinc');
+@include_once('testmanager/mconfig.pinc');
+
+$tutos[handler]['money']['yahoo'] = 'yahoo/yahoo_currency_converter.pinc';
+$tutos[handler]['country']['cia'] = 'cia_factbook/cia.pinc';
+$tutos[handler]['city']['map24'] = 'map24/map24.pinc';
+$tutos[handler]['city']['mapquest'] = 'mapquest/mapquest.pinc';
+$tutos[handler]['fax']['fax'] = 'fax/fax.pinc';
+$tutos[handler]['phone']['sms'] = 'sms/sms.pinc';
+$tutos[handler]['phone']['fax'] = 'fax/fax.pinc';
+$tutos[handler]['money']['oanda'] = 'oanda/oanda.pinc';
+$tutos[handler]['ISBN']['ISBN'] = 'isbn/isbn.pinc';
+$tutos[handler]['phone']['sipgate'] = 'sipgate/sipgate.pinc';
+$tutos['sipaddress'] = "12...@si...";
+
+
?>
Modified: trunk/php/calendar_day.php
===================================================================
--- trunk/php/calendar_day.php 2011-12-21 09:20:10 UTC (rev 486)
+++ trunk/php/calendar_day.php 2011-12-22 18:59:24 UTC (rev 487)
@@ -258,6 +258,7 @@
$this->t = Date("Ymd");
$this->tobj = new TUTOS_Date_Time();
$this->locs = array();
+ $this->team = array();
if ( isset ($_GET['t']) ) {
$this->t = $_GET['t'];
Modified: trunk/php/calendar_week.php
===================================================================
--- trunk/php/calendar_week.php 2011-12-21 09:20:10 UTC (rev 486)
+++ trunk/php/calendar_week.php 2011-12-22 18:59:24 UTC (rev 487)
@@ -197,6 +197,7 @@
}
$this->teamname = '';
$this->locs = array();
+ $this->team = array();
cal_parse_options($this);
$this->name .= $this->teamname;
Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc 2011-12-21 09:20:10 UTC (rev 486)
+++ trunk/php/config_default.pinc 2011-12-22 18:59:24 UTC (rev 487)
@@ -749,7 +749,7 @@
#
# The TUTOS Version number
#
-$tutos[version] = '1.8.20111220';
+$tutos[version] = '1.8.20111222';
#
### Local Variables: ***
### mode:iso-accents ***
Modified: trunk/php/database.pinc
===================================================================
--- trunk/php/database.pinc 2011-12-21 09:20:10 UTC (rev 486)
+++ trunk/php/database.pinc 2011-12-22 18:59:24 UTC (rev 487)
@@ -535,7 +535,7 @@
if (! file_exists($repo)) {
$msg = "<br />\nDocument Management:<br />missing repository directory \"".$repo."\"<br />\n";
$msg .= "Please change repository path in your config file<br />or create the missing path<br />or disable docmanagement \$tutos[usedocmanagement] = 0; in your config file (php/file/mconfig.pinc)<br />\n";
- Fatal_Error($msg,getcwd()."/". $tutos['base'] ."/".$this->repository);
+ Fatal_Error($msg,$repo);
}
}
Modified: trunk/php/invoice/invoice_overview.php
===================================================================
--- trunk/php/invoice/invoice_overview.php 2011-12-21 09:20:10 UTC (rev 486)
+++ trunk/php/invoice/invoice_overview.php 2011-12-22 18:59:24 UTC (rev 487)
@@ -295,26 +295,43 @@
$this->link1 = 'invoice/invoice_overview.php';
+ if (isset($_GET['ext'])) {
+ $this->ext = $_GET['ext'];
+ $this->link1 = addUrlParameter($this->link1,"ext=".$this->ext);
+ $this->link3 = addUrlParameter($this->link3,"ext=".$this->ext);
+ } else {
+ $this->ext = 2; // call from soemwhere else
+ }
+
+
overview_arg($this,'name',OVERVIEW_ARG_STRING,'invoice',array('name'),'InvoiceName');
- overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('customer','link_id'),array('InvoiceCustomer','InvoiceReference'));
+ if ($this->ext != 0) {
+ overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('customer','link_id'),array('InvoiceCustomer','InvoiceReference'));
+ }
+
// Start Date for search
- overview_arg($this,'f',OVERVIEW_ARG_D_FROM,'invoice',array('creation'),'ProdCreationS');
+ if ($this->ext != 0) {
+ overview_arg($this,'f',OVERVIEW_ARG_D_FROM,'invoice',array('creation'),'ProdCreationS');
+ }
// End Date for search
- overview_arg($this,'t',OVERVIEW_ARG_D_TO,'invoice',array('creation'),'ProdCreationS');
-
+ if ($this->ext != 0) {
+ overview_arg($this,'t',OVERVIEW_ARG_D_TO,'invoice',array('creation'),'ProdCreationS');
+ }
// States
- if ( isset($_GET['state']) && ($_GET['state'] == -2) ) {
- $_REQUEST['state'] = array(3,4,5,6);
+ if ($this->ext != 0) {
+ if ( isset($_GET['state']) && ($_GET['state'] == -2) ) {
+ $_REQUEST['state'] = array(3,4,5,6);
+ }
+ overview_arg($this,'state',OVERVIEW_ARG_INT,'invoice',array('state'),array('InvoiceState','InvoiceStates'));
}
- overview_arg($this,'state',OVERVIEW_ARG_INT,'invoice',array('state'),array('InvoiceState','InvoiceStates'));
-
// Customer
- overview_arg($this,'customerfn',OVERVIEW_ARG_FN,'invoice',array('customer'),'InvoiceCustomer','','atcdD');
- overview_arg($this,'customerid',OVERVIEW_ARG_OBJID,'invoice',array('customer'),'InvoiceCustomer','','atcdD');
+ if ($this->ext != 0) {
+ overview_arg($this,'customerfn',OVERVIEW_ARG_FN,'invoice',array('customer'),'InvoiceCustomer','','atcdD');
+ overview_arg($this,'customerid',OVERVIEW_ARG_OBJID,'invoice',array('customer'),'InvoiceCustomer','','atcdD');
+ }
-
check_dbacl($this->dbconn, $this->q, $this->user->id);
// sorting
Modified: trunk/php/invoice/invoice_select.php
===================================================================
--- trunk/php/invoice/invoice_select.php 2011-12-21 09:20:10 UTC (rev 486)
+++ trunk/php/invoice/invoice_select.php 2011-12-22 18:59:24 UTC (rev 487)
@@ -136,16 +136,13 @@
// Defaults for search
$this->isfd = new TUTOS_Date_Time(0);
$this->istd = new TUTOS_Date_Time(0);
- $this->isst = 0;
+ $this->isst = -1;
if ( isset($_SESSION['invsearchfrom']) ) {
$this->isfd->setDateTime($_SESSION['invsearchfrom']);
}
if ( isset($_SESSION['invsearchto']) ) {
$this->istd->setDateTime($_SESSION['invsearchto']);
}
- if ( isset($_SESSION['invsearchstate']) ) {
- $this->isst = $_SESSION['invsearchstate'];
- }
if ( isset($_GET['ext']) ) {
$this->ext = $_GET['ext'];
} else {
Modified: trunk/php/task_overview.php
===================================================================
--- trunk/php/task_overview.php 2011-12-21 09:20:10 UTC (rev 486)
+++ trunk/php/task_overview.php 2011-12-22 18:59:24 UTC (rev 487)
@@ -662,9 +662,17 @@
if ( ! $this->user->feature_ok(usetaskmanagement,PERM_SEE) ) {
$msg .= sprintf($lang['Err0022'],"'". $this->name ."'");
$this->stop = true;
+ return;
}
+ if (isset($_GET['ext'])) {
+ $this->ext = $_GET['ext'];
+ $this->link = addUrlParameter($this->link,"ext=".$this->ext);
+ } else {
+ $this->ext = 2; // call from somewhere else
+ }
+
// State
if ( isset($_REQUEST['state']) ) {
$tutos['task_skip_finished'] = 0; // no need/sense when selecting state
@@ -788,6 +796,7 @@
$this->parent[] = new dummy($this->dbconn);
$this->parent[0]->min_start = new TUTOS_Date_Time();
$this->parent[0]->max_end = new TUTOS_Date_Time(0);
+ $this->parent[0]->tasklist = array();
$classic_search = true;
}
@@ -798,7 +807,7 @@
// menu
$x = task::getSelectLink($this->user,$lang['Search']);
- if ($this->extsearch) {
+ if ($this->ext != 0) {
$x[url] = addUrlParameter($x[url],'ext=1');
}
$this->addMenu($x);
@@ -848,7 +857,7 @@
case "user":
case "team":
$x[url] = addUrlParameter($url,"fld=product");
- break;
+ break;
default:
$x[url] = addUrlParameter($url,"fld=worker");
break;
Modified: trunk/php/task_select.php
===================================================================
--- trunk/php/task_select.php 2011-12-21 09:20:10 UTC (rev 486)
+++ trunk/php/task_select.php 2011-12-22 18:59:24 UTC (rev 487)
@@ -112,6 +112,7 @@
$r .= "</tr>\n";
$r .= DoubleTableEnd();
$r .= hiddenFormElements();
+ $r .= $this->getHidden();
$r .= "</form>\n";
// shortcuts with urls
Modified: trunk/php/testmanager/de.p3
===================================================================
--- trunk/php/testmanager/de.p3 2011-12-21 09:20:10 UTC (rev 486)
+++ trunk/php/testmanager/de.p3 2011-12-22 18:59:24 UTC (rev 487)
@@ -21,13 +21,13 @@
$lang['TestcaseCreation'] = 'Add a Testcase';
$lang['TestcaseCreate'] = 'Add a Testcase';
$lang['TestcaseCreateInfo'] = 'Add a new testcase to %s';
-$lang['TestcaseDetail'] = 'Testcase Detail';
-$lang['TestcaseOverview'] = 'Testcase Overview';
+$lang['TestcaseDetail'] = 'Testfall Detail';
+$lang['TestcaseOverview'] = 'Testfall Übersicht';
$lang['TestcaseDelete'] = 'delete this testcase';
$lang['TestcaseDeleteI'] = 'delete testcase %s';
$lang['TestcaseMod'] = 'modify this testcase';
$lang['TestcaseLinkInfo'] = 'a testcase for %s';
-$lang['TestcaseResult'] = 'Result';
+$lang['TestcaseResult'] = 'Ergebnis';
$lang['TestcaseResults'][-1] = 'initial';
$lang['TestcaseResults'][0] = 'fail';
$lang['TestcaseResults'][1] = 'pass';
@@ -44,8 +44,8 @@
$lang['TestsuiteCreation'] = 'Create a Testsuite';
$lang['TestsuiteCreate'] = 'Add a Testsuite';
$lang['TestsuiteCreateInfo'] = 'Create a Testsuite for %s';
-$lang['TestsuiteDetail'] = 'Testsuite Detail';
-$lang['TestsuiteOverview'] = 'Testsuite Overview';
+$lang['TestsuiteDetail'] = 'Testspezifikation Detail';
+$lang['TestsuiteOverview'] = 'Testspezifikation Übersicht';
$lang['TestsuiteName'] = 'Name';
$lang['TestsuiteDesc'] = 'Beschreibung';
$lang['TestsuiteVersion'] = 'Version';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-21 09:20:16
|
Revision: 486
http://tutos.svn.sourceforge.net/tutos/?rev=486&view=rev
Author: gokohnert
Date: 2011-12-21 09:20:10 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
reappear pictures
Modified Paths:
--------------
trunk/php/address_show.php
trunk/php/address_tools.p3
Modified: trunk/php/address_show.php
===================================================================
--- trunk/php/address_show.php 2011-12-21 09:19:18 UTC (rev 485)
+++ trunk/php/address_show.php 2011-12-21 09:20:10 UTC (rev 486)
@@ -114,11 +114,9 @@
$r .= $this->showGuiIcons('<th class="icons">','</th>',$this->obj,$this->obj,array('mod','del','perm'),false);
$r .= "</tr>\n";
- if ($this->user->title != '')
- $r .= Show_LocFields($this->user,$lang['AdrTitle'],$this->obj,"title",0);
+ $r .= Show_LocFields($this->user,$lang['AdrTitle'],$this->obj,"title",0);
$r .= Show_LocFields($this->user,$lang['AdrFirstName'],$this->obj,"f_name",0);
- if ($this->user->m_name != '')
- $r .= Show_LocFields($this->user,$lang['AdrMiddleName'],$this->obj,"m_name",0);
+ $r .= Show_LocFields($this->user,$lang['AdrMiddleName'],$this->obj,"m_name",0);
$r .= Show_LocFields($this->user,$lang['AdrLastName'],$this->obj,"l_name",0);
$r .= Show_LocFields($this->user,$lang['AdrBirthday'],$this->obj,"birthday",0);
Modified: trunk/php/address_tools.p3
===================================================================
--- trunk/php/address_tools.p3 2011-12-21 09:19:18 UTC (rev 485)
+++ trunk/php/address_tools.p3 2011-12-21 09:20:10 UTC (rev 486)
@@ -107,17 +107,17 @@
$r .= ' <td colspan="'. $s .'"> '. $a->$name->getLinkDate() ." </td>\n";
} elseif ( $name == "title" ) {
$r .= ' <td colspan="'. $s .'"> '. myentities($a->$name) ." </td>\n";
+ $r .= " <td colspan=\"1\" rowspan=\"5\" valign=\"top\" align=\"right\">\n";
if ( class_exists('tutos_file') && ($a->pic_id > 1) && $current_user->feature_ok(usedocmanagement,PERM_SEE) ) {
$x = new tutos_file($a->dbconn);
$x->id = $a->pic_id;
- $r .= " <td colspan=\"1\" rowspan=\"5\" valign=\"top\" align=\"right\">\n";
$r .= makelink($x->getUrl() ."&format=show",
'<img alt="'. $a->getFullName() .'" height="100" border="0" src="'. addSessionKey($x->getUrl().'&format=show') .'">',
$a->getFullName());
- $r .= "</td>\n";
} else {
- $r .= " <td colspan=\"1\" rowspan=\"5\" valign=\"top\" align=\"right\"> </td>\n";
+ $r .= " ";
}
+ $r .= "</td>\n";
} else {
$r .= ' <td colspan="'. $s .'"> '. myentities($a->$name) ." </td>\n";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-21 09:19:29
|
Revision: 485
http://tutos.svn.sourceforge.net/tutos/?rev=485&view=rev
Author: gokohnert
Date: 2011-12-21 09:19:18 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
release preparation
Modified Paths:
--------------
trunk/Makefile
trunk/apache.conf.in
trunk/config.php.in
Property Changed:
----------------
trunk/config.php.in
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-12-20 21:33:27 UTC (rev 484)
+++ trunk/Makefile 2011-12-21 09:19:18 UTC (rev 485)
@@ -651,7 +651,7 @@
#
# TEST download packages
#
-TESTPATH=/home/gero/src/tutos-test
+TESTPATH=$(shell dirname $(shell pwd))/tutos-test
download-test:
@echo ${TESTPATH}
@$(RM) -rf ${TESTPATH}
Modified: trunk/apache.conf.in
===================================================================
--- trunk/apache.conf.in 2011-12-20 21:33:27 UTC (rev 484)
+++ trunk/apache.conf.in 2011-12-21 09:19:18 UTC (rev 485)
@@ -6,7 +6,7 @@
#
# Copyright: Gero Kohnert
#
-# $Header: /cvsroot/tutos/tutos/apache.conf.in,v 1.18 2008/08/18 11:36:39 gokohnert Exp $
+# $Id$
#
#
#
Modified: trunk/config.php.in
===================================================================
--- trunk/config.php.in 2011-12-20 21:33:27 UTC (rev 484)
+++ trunk/config.php.in 2011-12-21 09:19:18 UTC (rev 485)
@@ -1,8 +1,9 @@
<?php
-# SVN Info: $Id: auth_remoteuser.pinc 421 2011-11-16 16:53:28Z gokohnert $
-# $Author: gokohnert $
+#
+# SVN Info: $Id$
+# $Author$
# automade %FULLVERSION% on %HOST%
-$tutos[debug]=1;
+#
$tutos[dbname][1] = "tutos-test";
$tutos[dbhost][1] = "localhost";
$tutos[dbport][1] = 3306;
@@ -13,5 +14,13 @@
$tutos[cryptpw][1] = 1;
$tutos[repository][1] = "%PREFIX%/repo/";
$tutos[dbprefix][1] = "test";
-$tutos[baseurl][1] = "http://localhost/tutos-test";
+$tutos[baseurl][1] = "http://%HOST%/tutos-test";
+
+$tutos[debug]=1;
+$tutos['sqldebug'] = true;
+
+// do generate simple passwords for test
+$tutos['pw'] == 1
+
+
?>
Property changes on: trunk/config.php.in
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id Author Rev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-20 21:33:33
|
Revision: 484
http://tutos.svn.sourceforge.net/tutos/?rev=484&view=rev
Author: gokohnert
Date: 2011-12-20 21:33:27 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
prepare next release
Modified Paths:
--------------
trunk/Makefile
trunk/README
trunk/php/config_default.pinc
trunk/php/testmanager/testmanager.js
Added Paths:
-----------
trunk/config.php.in
Removed Paths:
-------------
trunk/php/reminder/README
trunk/php/report-engine/rep_doccheck/.cvsignore
trunk/php/report-engine/rep_subversion/.cvsignore
trunk/php/timetrack/.cvsignore
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-12-16 16:28:58 UTC (rev 483)
+++ trunk/Makefile 2011-12-20 21:33:27 UTC (rev 484)
@@ -2,7 +2,7 @@
# the ultimate team organization software
# ---------------------------------------
#
-# Copyright 1999-2009 by Gero Kohnert
+# Copyright 1999-2011 by Gero Kohnert
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -16,12 +16,12 @@
#
# Primary Version
-VERSION = 1.7
+VERSION = 1.8
#
# The full Version is VERSION.DATE
#
-DATE = `date +%Y%m%d`
-FULLVERSION = $(VERSION).$(DATE)
+DATE = $(shell date +%Y%m%d)
+FULLVERSION = $(VERSION).${DATE}
# Standard Files
PHP = $(PHP_TOP) \
@@ -39,6 +39,7 @@
$(PHP_BUG_TPL) \
$(PHP_XML) \
$(PHP_URL) \
+ $(PHP_URL_HLP) \
$(PHP_RES) \
$(PHP_RES_HLP) \
$(PHP_TT) \
@@ -124,6 +125,7 @@
# Docmanagement Module
PHP_FILE = $(wildcard php/file/*.php) \
php/file/.htaccess \
+ php/file/file_import.README \
$(wildcard php/file/*.p3) \
$(wildcard php/file/*.pinc)
PHP_FILE_HLP = php/file/help/.htaccess \
@@ -143,7 +145,7 @@
$(wildcard php/installation/*.p3) \
$(wildcard php/installation/*.pinc)
PHP_INST_HLP = $(wildcard php/installation/help/*.html) \
- php/rate/.htaccess
+ php/installation/.htaccess
# Invoice Module
PHP_INV = $(wildcard php/invoice/*.php) \
@@ -421,17 +423,21 @@
OTHER_HTML = html/.htaccess \
html/copyright.html \
+ html/LICENSE_bgiframe.txt \
html/motd_default.html \
html/js/jquery.min.js \
+ html/js/jquery.bt.min.js \
html/js/jquery.bgiframe.min.js \
html/js/jquery.hoverIntent.minified.js \
html/js/jquery-ui.custom.min.js \
+ html/js/jquery-ui-i18n.js \
html/js/superfish.js \
html/js/supersubs.js \
html/js/excanvas.min.js \
html/js/jquery.jqplot.min.js \
html/js/tutos.js \
html/js/new2_layout.js \
+ html/js/new_layout.js \
html/js/plugins/jqplot.barRenderer.min.js \
html/js/plugins/jqplot.canvasAxisTickRenderer.min.js \
html/js/plugins/jqplot.categoryAxisRenderer.min.js \
@@ -568,7 +574,7 @@
MV = $(shell which mv)
ZIP = $(shell which zip)
ZIPARGS = -9
-HOST = $(shell which hostname)
+HOST = $(shell hostname)
INSTALLARGS =
.PHONY: all clean distclean tutos.spec apache.conf
@@ -629,7 +635,7 @@
@$(foreach d,${PHP} ${LANGFILES} ${OTHER} ${HELP}, \
echo $(d) >> tmp.$@; \
)
- @cat tmp.$@ | grep -v "custom.p3" | grep -v "ja.p3" | grep -v "pt.p3" | grep -v "cs.p3" | grep -v "hu.p3" | grep -v "ca.p3"| grep -v "es-ve.p3" | grep -v "php/config.pinc" | grep -v "php/config.php" | grep -v "table_custom.pinc" | sort -u > $@
+ @cat tmp.$@ | grep -v "custom.p3" | grep -v "ja.p3" | grep -v "pt.p3" | grep -v "hu.p3" | grep -v "ca.p3"| grep -v "es-ve.p3" | grep -v "php/config.pinc" | grep -v "php/config.php" | grep -v "table_custom.pinc" | sort -u > $@
download-php: php.list additional
@tar -T php.list -cjf TUTOS-php-${FULLVERSION}.tar.bz2
@@ -643,6 +649,28 @@
@$(ECHO) "# upload-php to sourceforge finished"
#
+# TEST download packages
+#
+TESTPATH=/home/gero/src/tutos-test
+download-test:
+ @echo ${TESTPATH}
+ @$(RM) -rf ${TESTPATH}
+ mkdir -p ${TESTPATH}
+ @$(foreach d,$(wildcard TUTOS-*.zip), \
+ unzip -n -d ${TESTPATH} $(d); \
+ )
+ $(SED) \
+ -e 's;%HOST%;${HOST};g' \
+ -e 's;Alias /tutos;Alias /tutos-test;g' \
+ -e 's;%PREFIX%;${TESTPATH};g' < apache.conf.in > ${TESTPATH}/apache.conf
+ @${CHMOD} 644 ${TESTPATH}/apache.conf
+ $(SED) \
+ -e 's;%HOST%;${HOST};g' \
+ -e 's;%PREFIX%;${TESTPATH};g' \
+ -e 's;%FULLVERSION;${FULLVERSION};g' < config.php.in > ${TESTPATH}/php/config.php
+ @${CHMOD} 644 ${TESTPATH}/php/config.php
+
+#
# RPM Release
#
rpm-php: tutos.spec download-php
@@ -1002,6 +1030,8 @@
PHP_TESTMANAGER = $(wildcard php/testmanager/*.php) \
$(wildcard php/testmanager/*.p3) \
$(wildcard php/testmanager/*.pinc) \
+ php/testmanager/testmanager.js \
+ php/testmanager/default.css \
php/testmanager/.htaccess \
php/testmanager/README
PHP_TESTMANAGER_HLP = php/testmanager/help/.htaccess \
@@ -1250,6 +1280,7 @@
HDL_WEATHER = $(wildcard php/phpweather/*.php) \
$(wildcard php/phpweather/*.p3) \
$(wildcard php/phpweather/*.pinc) \
+ libs/phpweather/TUTOS-README \
php/phpweather/README
HDL_phpweather.zip: $(HDL_WEATHER)
Modified: trunk/README
===================================================================
--- trunk/README 2011-12-16 16:28:58 UTC (rev 483)
+++ trunk/README 2011-12-20 21:33:27 UTC (rev 484)
@@ -21,11 +21,12 @@
- team organistaion
- timetracking
- invoices
+- scrum/sprint support
+- inventory support
and all these things heavily linked together
-
For installation see INSTALL or better homepage/install.html
# EOF
Added: trunk/config.php.in
===================================================================
--- trunk/config.php.in (rev 0)
+++ trunk/config.php.in 2011-12-20 21:33:27 UTC (rev 484)
@@ -0,0 +1,17 @@
+<?php
+# SVN Info: $Id: auth_remoteuser.pinc 421 2011-11-16 16:53:28Z gokohnert $
+# $Author: gokohnert $
+# automade %FULLVERSION% on %HOST%
+$tutos[debug]=1;
+$tutos[dbname][1] = "tutos-test";
+$tutos[dbhost][1] = "localhost";
+$tutos[dbport][1] = 3306;
+$tutos[dbuser][1] = "wwwrun";
+$tutos[dbpasswd][1] = "tutos-test";
+$tutos[dbtype][1] = 14;
+$tutos[dbalias][1] = "MYSQL TEST database";
+$tutos[cryptpw][1] = 1;
+$tutos[repository][1] = "%PREFIX%/repo/";
+$tutos[dbprefix][1] = "test";
+$tutos[baseurl][1] = "http://localhost/tutos-test";
+?>
Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc 2011-12-16 16:28:58 UTC (rev 483)
+++ trunk/php/config_default.pinc 2011-12-20 21:33:27 UTC (rev 484)
@@ -749,7 +749,7 @@
#
# The TUTOS Version number
#
-$tutos[version] = '1.7.20111116';
+$tutos[version] = '1.8.20111220';
#
### Local Variables: ***
### mode:iso-accents ***
Deleted: trunk/php/reminder/README
===================================================================
--- trunk/php/reminder/README 2011-12-16 16:28:58 UTC (rev 483)
+++ trunk/php/reminder/README 2011-12-20 21:33:27 UTC (rev 484)
@@ -1,31 +0,0 @@
-
-
-This is the reminder module for TUTOS
-
-This module provides a list of reminders attached to TUTOS objects
-
-Those reminders will automatically send mails or popup when it is
-time to remind the user(s)
-
-Installation:
- After unpacking this module you should have a reminder subdirectory in your
- [tutos install dir]/php directory.
-
-Activation:
- For activation you should have a line
- @include("reminder/mconfig.pinc");
- somewhere in your [tutos install dir]/php/config.* file
-
- run http://....../php/admin/update.php?id=xxx
- where xxx is your database index from config (in most cases this is 0)
-
-License:
- GPL
-
-Copyright
- All rights reserved
- Copyright 2004 by Gero Kohnert
-
-
-
-# $Id: README,v 1.2 2009/03/08 20:21:37 gokohnert Exp $
Deleted: trunk/php/report-engine/rep_doccheck/.cvsignore
===================================================================
--- trunk/php/report-engine/rep_doccheck/.cvsignore 2011-12-16 16:28:58 UTC (rev 483)
+++ trunk/php/report-engine/rep_doccheck/.cvsignore 2011-12-20 21:33:27 UTC (rev 484)
@@ -1,6 +0,0 @@
-#
-# $Id: .cvsignore,v 1.1 2010/02/12 13:38:30 gokohnert Exp $
-#
-*~
-config.php
-*_custom.p3
\ No newline at end of file
Deleted: trunk/php/report-engine/rep_subversion/.cvsignore
===================================================================
--- trunk/php/report-engine/rep_subversion/.cvsignore 2011-12-16 16:28:58 UTC (rev 483)
+++ trunk/php/report-engine/rep_subversion/.cvsignore 2011-12-20 21:33:27 UTC (rev 484)
@@ -1,6 +0,0 @@
-#
-# $Id: .cvsignore,v 1.1 2010/02/12 13:38:30 gokohnert Exp $
-#
-*~
-config.php
-*_custom.p3
\ No newline at end of file
Modified: trunk/php/testmanager/testmanager.js
===================================================================
--- trunk/php/testmanager/testmanager.js 2011-12-16 16:28:58 UTC (rev 483)
+++ trunk/php/testmanager/testmanager.js 2011-12-20 21:33:27 UTC (rev 484)
@@ -7,7 +7,7 @@
*
* Collection of Javascript functions used in testmanager
*
- * CVS Info: $Id: tutos.js 40 2011-02-20 19:44:39Z gokohnert $
+ * SVN Info: $Id: tutos.js 40 2011-02-20 19:44:39Z gokohnert $
* $Author: gokohnert $
*/
Deleted: trunk/php/timetrack/.cvsignore
===================================================================
--- trunk/php/timetrack/.cvsignore 2011-12-16 16:28:58 UTC (rev 483)
+++ trunk/php/timetrack/.cvsignore 2011-12-20 21:33:27 UTC (rev 484)
@@ -1,5 +0,0 @@
-#
-# $Id: .cvsignore,v 1.1 2011/01/19 19:55:00 gokohnert Exp $
-#
-*~
-*_custom.p3
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-16 16:29:09
|
Revision: 483
http://tutos.svn.sourceforge.net/tutos/?rev=483&view=rev
Author: gokohnert
Date: 2011-12-16 16:28:58 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
serach_by_name looks also in short description
Modified Paths:
--------------
trunk/php/bugtracking/bug.pinc
Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc 2011-12-14 19:10:44 UTC (rev 482)
+++ trunk/php/bugtracking/bug.pinc 2011-12-16 16:28:58 UTC (rev 483)
@@ -571,9 +571,9 @@
$qx = ' id = '.$regs[1];
}
} else {
- $qx = $user->dbconn->Like("name",$name);
+ $qx = '('.$user->dbconn->Like('name',$name).' or '.$user->dbconn->Like('short',$name).')';
}
- $q = 'SELECT '.($mode == 1 ? '*':'id').' from '. $user->dbconn->prefix .$table['bugtracking'][name] .' WHERE ';
+ $q = 'SELECT '.($mode == 1 ? 'b.*':'b.id').' from '. $user->dbconn->prefix .$table['bugtracking'][name] .' b WHERE ';
$q .= $qx;
$q .= ' order by name ';
check_dbacl($user->dbconn, $q, $user->id);
@@ -1447,7 +1447,7 @@
case 'BugReportedFrom':
case 'BugCreate':
$x = resolve_history_obj($f,$this->dbconn);
- break;
+ break;
case 'BugAssignedTo':
$x = $f;
if ($f['old'] < 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-14 19:10:50
|
Revision: 482
http://tutos.svn.sourceforge.net/tutos/?rev=482&view=rev
Author: gokohnert
Date: 2011-12-14 19:10:44 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
allow reminders for custom fields
Modified Paths:
--------------
trunk/php/installation/installation.pinc
trunk/php/invoice/invoice.pinc
trunk/php/scrum/scrum.pinc
Modified: trunk/php/installation/installation.pinc
===================================================================
--- trunk/php/installation/installation.pinc 2011-12-14 19:05:59 UTC (rev 481)
+++ trunk/php/installation/installation.pinc 2011-12-14 19:10:44 UTC (rev 482)
@@ -591,13 +591,12 @@
global $lang;
$x = parent::get_date_fields();
- $r[10] = array('salesdate',$lang['SoldDateTime']);
- $r[11] = array('instdate',$lang['InstDateTime']);
+ $x[0][10] = array('salesdate',$lang['SoldDateTime']);
+ $x[0][11] = array('instdate',$lang['InstDateTime']);
// possible Offsets
- $o = array(0,
- 3600*1,3600*2,86400*1,86400*2,86400*7*1,86400*7*4,86400*7*52);
+ $x[1] = array_unique($x[1] + array(0,3600*1,3600*2,86400*1,86400*2,86400*7*1,86400*7*4,86400*7*52));
- return array($r,$o);
+ return $x;
}
/**
Modified: trunk/php/invoice/invoice.pinc
===================================================================
--- trunk/php/invoice/invoice.pinc 2011-12-14 19:05:59 UTC (rev 481)
+++ trunk/php/invoice/invoice.pinc 2011-12-14 19:10:44 UTC (rev 482)
@@ -1104,18 +1104,18 @@
global $lang;
$x = parent::get_date_fields();
- $r[10] = array('d_sent0',$lang['InvDateSent'][0]);
- $r[11] = array('d_due0' ,$lang['InvDateDue'][0]);
- $r[12] = array('d_sent1',$lang['InvDateSent'][1]);
- $r[13] = array('d_due1' ,$lang['InvDateDue'][1]);
- $r[14] = array('d_sent2',$lang['InvDateSent'][2]);
- $r[15] = array('d_due2' ,$lang['InvDateDue'][2]);
- $r[16] = array('datefinish' ,$lang['InvDatePayed']);
+ $x[0][10] = array('d_sent0',$lang['InvDateSent'][0]);
+ $x[0][11] = array('d_due0' ,$lang['InvDateDue'][0]);
+ $x[0][12] = array('d_sent1',$lang['InvDateSent'][1]);
+ $x[0][13] = array('d_due1' ,$lang['InvDateDue'][1]);
+ $x[0][14] = array('d_sent2',$lang['InvDateSent'][2]);
+ $x[0][15] = array('d_due2' ,$lang['InvDateDue'][2]);
+ $x[0][16] = array('datefinish' ,$lang['InvDatePayed']);
// possible Offsets
- $o = array(-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0,
- 3600*1,3600*2,86400*1,86400*2,86400*7*1,86400*7*4,86400*7*52);
+ $x[1] = array_unique($x[1] + array(-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0,
+ 3600*1,3600*2,86400*1,86400*2,86400*7*1,86400*7*4,86400*7*52));
- return array($r,$o);
+ return $x;
}
/**
Modified: trunk/php/scrum/scrum.pinc
===================================================================
--- trunk/php/scrum/scrum.pinc 2011-12-14 19:05:59 UTC (rev 481)
+++ trunk/php/scrum/scrum.pinc 2011-12-14 19:10:44 UTC (rev 482)
@@ -595,12 +595,12 @@
global $lang;
$x = parent::get_date_fields();
- $r[10] = array('start_dt',$lang['ScrumLogStart']);
+ $x[0][10] = array('start_dt',$lang['ScrumLogStart']);
// possible Offsets
- $o = array(-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0,
- 3600*1,3600*2,86400*1,86400*2,86400*7*1);
+ $x[1] = array_unique($x[1] + array(-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0,
+ 3600*1,3600*2,86400*1,86400*2,86400*7*1));
- return array($r,$o);
+ return $x;
}
/**
@@ -1314,13 +1314,13 @@
global $lang;
$x = parent::get_date_fields();
- $r[10] = array('start_dt',$lang['SprintStart']);
- $r[11] = array('end_dt',$lang['SprintEnd']);
+ $x[0][10] = array('start_dt',$lang['SprintStart']);
+ $x[0][11] = array('end_dt',$lang['SprintEnd']);
// possible Offsets
- $o = array(-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0,
- 3600*1,3600*2,86400*1,86400*2,86400*7*1);
+ $x[1] = array_unique($x[1] + array(-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0,
+ 3600*1,3600*2,86400*1,86400*2,86400*7*1));
- return array($r,$o);
+ return $x;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-14 19:06:05
|
Revision: 481
http://tutos.svn.sourceforge.net/tutos/?rev=481&view=rev
Author: gokohnert
Date: 2011-12-14 19:05:59 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
allow reminders for custom fields
Modified Paths:
--------------
trunk/php/address.pinc
trunk/php/base.pinc
trunk/php/bugtracking/bug.pinc
trunk/php/product.pinc
trunk/php/reminder/reminder_ins.php
trunk/php/stuff/stuff.pinc
trunk/php/task.pinc
Modified: trunk/php/address.pinc
===================================================================
--- trunk/php/address.pinc 2011-12-14 16:45:42 UTC (rev 480)
+++ trunk/php/address.pinc 2011-12-14 19:05:59 UTC (rev 481)
@@ -661,11 +661,11 @@
global $lang;
$x = parent::get_date_fields();
- $r[REMINDER_ADR_BIRTHDAY] = array('birthday',$lang['AdrBirthday']);
+ $x[0][REMINDER_ADR_BIRTHDAY] = array('birthday',$lang['AdrBirthday']);
// possible Offsets
- $o = array(-86400*7*2,-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0);
+ $x[1] = array_unique($x[1] + array(-86400*7*2,-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0));
- return array($r,$o);
+ return $x;
}
/* ---------------------------------------------------------------------------
Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc 2011-12-14 16:45:42 UTC (rev 480)
+++ trunk/php/base.pinc 2011-12-14 19:05:59 UTC (rev 481)
@@ -89,6 +89,13 @@
$this->tablename_hash = $table['objectids'][name];
$this->tablename_rel = $table['objrel'][name];
+ // needed for initializing overloaded classes
+ if ($sector != '') {
+ $this->sector = $sector;
+ } else {
+ $this->sector = $this->gettype();
+ }
+
if (isset($current_user->id)) {
acl_set($this,$current_user->id,$tutos[modok]);
}
@@ -97,17 +104,11 @@
//
// initialize automatable database fields
//
- if ($sector != '')
- $this->init_auto($sector);
- else
- $this->init_auto($this->gettype());
+ $this->init_auto($this->sector);
//
// initialize custom database fields
//
- if ($sector != '')
- $this->init_custom($sector);
- else
- $this->init_custom($this->gettype());
+ $this->init_custom($this->sector);
}
/**
@@ -1668,8 +1669,22 @@
* return a list of possible date fields (for reminder)
*/
function get_date_fields() {
+ global $table;
+
$r = array();
$o = array();
+
+ $idx = 110;
+ if (isset($table[$this->sector])) {
+ foreach($table[$this->sector] as $i => $x) {
+ if (!is_array($x)) continue;
+ if (!isset($x[type])) continue;
+ if (!isset($x['custom']) || !$x['custom']) continue;
+ if ($x[type] != 'TS_TYPE') continue;
+ $r[$idx++] = array('_fld_'.$i,$x['lang']);
+ }
+ }
+
return array($r,$o);
}
}
Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc 2011-12-14 16:45:42 UTC (rev 480)
+++ trunk/php/bugtracking/bug.pinc 2011-12-14 19:05:59 UTC (rev 481)
@@ -1425,12 +1425,12 @@
global $lang;
$x = parent::get_date_fields();
- $r[REMINDER_BUG_SOLVE_AT] = array('plandate',$lang['DateTimeTill']);
+ $x[0][REMINDER_BUG_SOLVE_AT] = array('plandate',$lang['DateTimeTill']);
// possible Offsets
- $o = array(-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0,
- 3600*1,3600*2,86400*1,86400*2,86400*7*1);
+ $x[1] = array_unique($x[1] + array(-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0,
+ 3600*1,3600*2,86400*1,86400*2,86400*7*1));
- return array($r,$o);
+ return $x;
}
/**
Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc 2011-12-14 16:45:42 UTC (rev 480)
+++ trunk/php/product.pinc 2011-12-14 19:05:59 UTC (rev 481)
@@ -1392,8 +1392,8 @@
case 'ProdStart':
case 'ProdEnd':
$x = resolve_history_datetime($f,$this->dbconn);
- return $x;
- break;
+ return $x;
+ break;
default:
return null;
}
@@ -1481,13 +1481,14 @@
global $lang;
$x = parent::get_date_fields();
- $r[REMINDER_PROD_START] = array('p_start',$lang['ProdStart']);
- $r[REMINDER_PROD_END] = array('p_end',$lang['ProdEnd']);
+ $x[0][REMINDER_PROD_START] = array('p_start',$lang['ProdStart']);
+ $x[0][REMINDER_PROD_END] = array('p_end',$lang['ProdEnd']);
+
// possible Offsets
- $o = array(-86400*7*2,-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0,
- 3600*1,3600*2,86400*1,86400*2,86400*7*1,86400*7*2);
+ $x[1] = array_unique($x[1] + array(-86400*7*2,-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0,
+ 3600*1,3600*2,86400*1,86400*2,86400*7*1,86400*7*2));
- return array($r,$o);
+ return $x;
}
/**
Modified: trunk/php/reminder/reminder_ins.php
===================================================================
--- trunk/php/reminder/reminder_ins.php 2011-12-14 16:45:42 UTC (rev 480)
+++ trunk/php/reminder/reminder_ins.php 2011-12-14 19:05:59 UTC (rev 481)
@@ -69,11 +69,7 @@
}
$obj->setUseMail($usemail);
-if(isset($_POST['usemail'])) {
- $obj->setOffset($_POST['offset']);
-} else {
- $obj->setOffset(0);
-}
+
$r = new TUTOS_Date_Time(0);
$type = REMINDER_SIMPLE;
if(isset($_POST['type']) && $_POST['type'] == 0) {
@@ -86,6 +82,11 @@
} else {
$msg .= sprintf($lang['Err0009'],$lang['ReminderType']) ."<br />";
}
+if ($type == REMINDER_SIMPLE)
+ $obj->setOffset(0);
+else
+ $obj->setOffset($_POST['offset']);
+
$gotourl= addUrlParameter($gotourl,"rd_type=". UrlEncode($type),true);
$gotourl= addUrlParameter($gotourl,"offset=". UrlEncode($obj->offset),true);
Modified: trunk/php/stuff/stuff.pinc
===================================================================
--- trunk/php/stuff/stuff.pinc 2011-12-14 16:45:42 UTC (rev 480)
+++ trunk/php/stuff/stuff.pinc 2011-12-14 19:05:59 UTC (rev 481)
@@ -347,8 +347,8 @@
case 'StuffUser':
case 'StuffSource':
$x = resolve_history_obj($f,$this->dbconn);
- return $x;
- break;
+ return $x;
+ break;
default:
return null;
}
@@ -375,11 +375,11 @@
global $lang;
$x = parent::get_date_fields();
- $r[10] = array('p_date',$lang['StuffPurchaseDate']);
+ $x[0][10] = array('p_date',$lang['StuffPurchaseDate']);
// possible Offsets
- $o = array(0,3600*1,3600*2,86400*1,86400*2,86400*7*1,86400*7*2,86400*7*52);
+ $x[1] = array_unique($x[1] + array(0,3600*1,3600*2,86400*1,86400*2,86400*7*1,86400*7*2,86400*7*52));
- return array($r,$o);
+ return $x;
}
/**
Modified: trunk/php/task.pinc
===================================================================
--- trunk/php/task.pinc 2011-12-14 16:45:42 UTC (rev 480)
+++ trunk/php/task.pinc 2011-12-14 19:05:59 UTC (rev 481)
@@ -2034,15 +2034,15 @@
global $lang;
$x = parent::get_date_fields();
- $r[REMINDER_TASK_START] = array('s_start',$lang['TaskS_Start']);
- $r[REMINDER_TASK_END] = array('s_end',$lang['TaskS_End']);
- $r[REMINDER_REAL_TASK_START] = array('r_start',$lang['TaskReal'].' '.$lang['StartDate']);
- $r[REMINDER_REAL_TASK_END] = array('r_end',$lang['TaskReal'].' '.$lang['EndDate']);
+ $x[0][REMINDER_TASK_START] = array('s_start',$lang['TaskS_Start']);
+ $x[0][REMINDER_TASK_END] = array('s_end',$lang['TaskS_End']);
+ $x[0][REMINDER_REAL_TASK_START] = array('r_start',$lang['TaskReal'].' '.$lang['StartDate']);
+ $x[0][REMINDER_REAL_TASK_END] = array('r_end',$lang['TaskReal'].' '.$lang['EndDate']);
// possible Offsets
- $o = array(-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0,
- 3600*1,3600*2,86400*1,86400*2,86400*7*1);
+ $x[1] = array_unique($x[1] + array(-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0,
+ 3600*1,3600*2,86400*1,86400*2,86400*7*1));
- return array($r,$o);
+ return $x;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-14 16:45:53
|
Revision: 480
http://tutos.svn.sourceforge.net/tutos/?rev=480&view=rev
Author: gokohnert
Date: 2011-12-14 16:45:42 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/help.php
Modified: trunk/php/help.php
===================================================================
--- trunk/php/help.php 2011-12-14 09:32:01 UTC (rev 479)
+++ trunk/php/help.php 2011-12-14 16:45:42 UTC (rev 480)
@@ -30,6 +30,7 @@
function nextid($name = "id") {}
function Like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {}
function Like2($fld,$name,$not=false) {}
+ function needCount() { return false; }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-12-14 09:32:12
|
Revision: 479
http://tutos.svn.sourceforge.net/tutos/?rev=479&view=rev
Author: gokohnert
Date: 2011-12-14 09:32:01 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
fix (?) for IE
Modified Paths:
--------------
trunk/php/bugtracking/bug.pinc
Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc 2011-12-12 15:22:29 UTC (rev 478)
+++ trunk/php/bugtracking/bug.pinc 2011-12-14 09:32:01 UTC (rev 479)
@@ -478,8 +478,8 @@
if ($desc != $olddesc) {
$r .= $desc ."\n";
}
- $sep = '<hr noshade="noshade" size="1" />';
- # $sep = "--------------------\n";
+ //$sep = '<hr noshade="noshade" size="1" />';
+ $sep = "--------------------\n";
}
$olddesc = $desc;
}
@@ -1447,7 +1447,7 @@
case 'BugReportedFrom':
case 'BugCreate':
$x = resolve_history_obj($f,$this->dbconn);
- break;
+ break;
case 'BugAssignedTo':
$x = $f;
if ($f['old'] < 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|