From: Jonny B. <tw...@no...> - 2009-11-23 23:04:06
|
You mean this is effecting trackers not created by profiles somehow? The plan was that it should only be profile-created-trackers that must have unique fields (otherwise $trackerId !== false and $fieldId !== false in trackerlib, no?). Maybe i missed a case... jb On 23 Nov 2009, at 19:55, Sylvie Greverend wrote: > :-( > I have a tracker that has > header 1 > This is my field > header 2 > THis is my field > Whith the same name for the fields - That is ok because it is not in > the > same context > Can we replace the filed with a position check instead? > Thanks > sylvie > > On Wed, 2009-06-03 at 17:43 +0000, jon...@us... > wrote: >> Revision: 19312 >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=19312&view=rev >> Author: jonnybradley >> Date: 2009-06-03 17:43:19 +0000 (Wed, 03 Jun 2009) >> >> Log Message: >> ----------- >> [MOD] When creating trackers and fields from profiles (only) reuse >> existing tracker or field by name if found. >> Should reduce problems caused by running profiles more than once. >> Tracker admin behaviour remains as was. >> >> Modified Paths: >> -------------- >> trunk/lib/profilelib/installlib.php >> trunk/lib/trackers/trackerlib.php >> >> Modified: trunk/lib/profilelib/installlib.php >> =================================================================== >> --- trunk/lib/profilelib/installlib.php 2009-06-03 17:35:41 UTC >> (rev 19311) >> +++ trunk/lib/profilelib/installlib.php 2009-06-03 17:43:19 UTC >> (rev 19312) >> @@ -448,8 +448,9 @@ >> global $trklib; >> if( ! $trklib ) >> require_once 'lib/trackers/trackerlib.php'; >> - >> - return $trklib->replace_tracker( 0, $name, $description, >> $options ); >> + >> + // using false as trackerId stops multiple trackers of same name >> being created >> + return $trklib->replace_tracker( false, $name, $description, >> $options, 'y' ); >> } // }}} >> } // }}} >> >> @@ -562,7 +563,7 @@ >> >> return $trklib->replace_tracker_field( >> $data['tracker'], >> - 0, >> + false, >> $data['name'], >> $data['type'], >> $data['link'], >> >> Modified: trunk/lib/trackers/trackerlib.php >> =================================================================== >> --- trunk/lib/trackers/trackerlib.php 2009-06-03 17:35:41 UTC (rev >> 19311) >> +++ trunk/lib/trackers/trackerlib.php 2009-06-03 17:43:19 UTC (rev >> 19312) >> @@ -2070,6 +2070,9 @@ >> >> // Inserts or updates a tracker >> function replace_tracker($trackerId, $name, $description, >> $options, $descriptionIsParsed) { >> + if ($trackerId === false && !empty($name)) { // called from >> profiles - update not replace >> + $trackerId = $this->getOne('select max(`trackerId`) from >> `tiki_trackers` where `name`=?',array($name)); >> + } >> if ($trackerId) { >> $old = $this->getOne('select count(*) from `tiki_trackers` where >> `trackerId`=?',array((int)$trackerId)); >> if ($old) { >> @@ -2146,6 +2149,10 @@ >> } else { >> $editableBy = ''; >> } >> + >> + if ($fieldId === false && $trackerId && !empty($name)) { // >> called from profiles - update not replace >> + $fieldId = $this->getOne("select max(`fieldId`) from >> `tiki_tracker_fields` where `trackerId`=? and `name`=?",array((int) >> $trackerId,$name)); >> + } >> >> if ($fieldId) { >> // ------------------------------------- >> >> >> This was sent by the SourceForge.net collaborative development >> platform, the world's largest Open Source development site. >> >> ------------------------------------------------------------------------------ >> OpenSolaris 2009.06 is a cutting edge operating system for >> enterprises >> looking to deploy the next generation of Solaris that includes the >> latest >> innovations from Sun and the OpenSource community. Download a copy >> and >> enjoy capabilities such as Networking, Storage and Virtualization. >> Go to: http://p.sf.net/sfu/opensolaris-get >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > ------------------------------------------------------------------------------ > Let Crystal Reports handle the reporting - Free Crystal Reports 2008 > 30-Day > trial. Simplify your report design, integration and deployment - and > focus on > what you do best, core application coding. Discover what's new with > Crystal Reports now. http://p.sf.net/sfu/bobj-july > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |