From: Marc K. <Mar...@pr...> - 2006-11-28 16:22:07
|
Hi , I'll work with this feature the next two weeks -> It will be correctly=20 tested ;-) Your remark about a parameter is right, I'll have a look how those are=20 working, I would prefer to set an option at the field level(with=20 full/partial/none support), rather than tracker level. ++ Marc Sylvie Greverend a =E9crit : > hangerman, > Be careful to check for previous compatibility. > Do we need a parameter to a textarea field: wiki-parseable? > My 2 cents > sylvie > > On Tue, 2006-11-28 at 07:23 -0800, han...@us... > wrote: > =20 >> Update of /cvsroot/tikiwiki/tiki/lib/trackers >> In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30952/lib/track= ers >> >> Modified Files: >> trackerlib.php=20 >> Log Message: >> Wiki parsed string for tracker Item text area >> >> Index: trackerlib.php >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> RCS file: /cvsroot/tikiwiki/tiki/lib/trackers/trackerlib.php,v >> retrieving revision 1.147 >> retrieving revision 1.148 >> diff -u -d -r1.147 -r1.148 >> --- trackerlib.php 27 Nov 2006 08:45:46 -0000 1.147 >> +++ trackerlib.php 28 Nov 2006 15:23:27 -0000 1.148 >> @@ -350,21 +350,25 @@ >> =20 >> /* experimental shared */ >> function get_item_value($trackerId,$itemId,$fieldId) { >> + $res=3D"";=20 >> + $fieldInfo=3D$this->get_tracker_field($fieldId); >> + $isTextArea=3D($fieldInfo['type']=3D=3D'a'); >> $basequery =3D "select ttif.`value` from `tiki_tracker_items` tti, = `tiki_tracker_fields` ttf, `tiki_tracker_item_fields` ttif where tti.`tra= ckerId`=3Dttf.`trackerId` and ttif.`fieldId`=3Dttf.`fieldId` and ttf.`tra= ckerId`=3D? and ttf.`fieldId`=3D? and ttif.`itemId`=3D? "; >> if ($this->is_multilingual($fieldId)=3D=3D'y') { >> global $language; >> $query=3D "$basequery and ttif.`lang`=3D?"; >> $res=3D$this->getOne($query,array((int) $trackerId,(int)$fieldId,(= int)$itemId,(string)$language)); >> - // Check if a translation was given >> - if (isset($res)&& $res!=3D'' ) >> - return $res; >> } >> - //Fields is not multilingual >> - $query =3D $basequery; >> - return $this->getOne($query,array((int) $trackerId,(int)$= fieldId,(int)$itemId)); >> -=09 >> -=09 >> - =09 >> + if (!isset($res) || $res=3D=3D'' ){ >> + //Try normal query >> + $query =3D $basequery; >> + $res=3D$this->getOne($query,array((int) $trackerI= d,(int)$fieldId,(int)$itemId)); >> + } >> + if ($isTextArea){ >> + global $tikilib; >> + return $tikilib->parse_data($res,'full'); >> + } else >> + return $res; >> } >> =20 >> /* experimental shared */ >> >> >> ----------------------------------------------------------------------= --- >> Take Surveys. Earn Cash. Influence the Future of IT >> Join SourceForge.net's Techsay panel and you'll get the chance to shar= e your >> opinions on IT & business topics through brief surveys - and earn cash >> http://www.techsay.com/default.php?page=3Djoin.php&p=3Dsourceforge&CID= =3DDEVDEV >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >> =20 > > > -----------------------------------------------------------------------= -- > Take Surveys. Earn Cash. Influence the Future of IT > Join SourceForge.net's Techsay panel and you'll get the chance to share= your > opinions on IT & business topics through brief surveys - and earn cash > http://www.techsay.com/default.php?page=3Djoin.php&p=3Dsourceforge&CID=3D= DEVDEV > _______________________________________________ > Tikiwiki-devel mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel > =20 --=20 Programmers.ch Solutions libres et Opensources Tel: ++41 76 44 888 72 Site: http://www.programmers.ch Site: http://openprojects.ch |