Re: BitKeeper patch
Marcel van der Boom <[email protected]> Tue, 24 Jun 2003 10:19:31 +0200
| Newsgroups | gmane.comp.cms.xaraya.patches |
|---|---|
| Organization | HS-Development BV |
| Message-ID | <[email protected]> |
And applied this one. Minor change to the pathc -> commented out error_log functions. marcel On Sunday 22 June 2003 19:21, Jonn Stephen Beames wrote: > This BitKeeper patch contains the following changesets: > jbeames-rIoA2dxFqdxvvToxOdHx6mP8kLm7lcA4hIvA6WVW+J8@public.gmane.org|ChangeSet|20030622044515|46777 > > # ID: [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a > # User: jbeames > # Host: lxwdev-1.schwabfoundation.org > # Root: /home/jbeames/project/xaraya-stable > > # Patch vers: 1.3 > # Patch type: REGULAR > > == ChangeSet == > [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a > Jason.Judge@acad-ajp.|ChangeSet|20030622015109|44550 > D 1.1103 03/06/21 21:45:15-07:00 jbeames-rIoA2dxFqdxvvToxOdHx6mP8kLm7lcA4hIvA6WVW+J8@public.gmane.org +3 > -0 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a > C > c Fixed multi-select problem. Added filter by category. > c > c Hello Marcel - I hope I do this correctly and only send you > c my little changes. Any chance a xaraya-stable patch system is > c in the works? Either way, thanks for setting things up! > c - Jonn Beames > K 46777 > P ChangeSet > ------------------------------------------------ > > 0a0 >> [email protected]|html/modules/articles/xartemplates/blocks/featureditemsAdmin.xd|20030620180147|09167|2ccc3f67 >> jbeames-rIoA2dxFqdxvvToxOdHx6mP8kLm7lcA4hIvA6WVW+J8@public.gmane.org|html/modules/articles/xartemplates/blocks/featureditemsAdmin.xd|20030622044508|29735 >> [email protected]|html/modules/articles/xarblocks/featureditems.php|20030620180147|29087|2cc0ac1f >> jbeames-rIoA2dxFqdxvvToxOdHx6mP8kLm7lcA4hIvA6WVW+J8@public.gmane.org|html/modules/articles/xarblocks/featureditems.php|20030622044508|10850 >> [email protected]|BitKeeper/etc/logging_ok|20020928132559|02556|36872ac13653ac68 >> jbeames-rIoA2dxFqdxvvToxOdHx6mP8kLm7lcA4hIvA6WVW+J8@public.gmane.org|BitKeeper/etc/logging_ok|20030622044515|05186 > > == html/modules/articles/xarblocks/featureditems.php == > [email protected]|html/modules/articles/xarblocks/featureditems.php|20030620180147|29087|2cc0ac1f > [email protected]|html/modules/articles/xarblocks/featureditems.php|20030620180148|01998 > D 1.2 03/06/21 21:45:08-07:00 jbeames-rIoA2dxFqdxvvToxOdHx6mP8kLm7lcA4hIvA6WVW+J8@public.gmane.org +32 -6 > B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a > C > c Fixed multi-select problem. Added filter by category. > K 10850 > O -rw-rw-rw- > P html/modules/articles/xarblocks/featureditems.php > ------------------------------------------------ > > D8 1 > I8 1 > // Original Author of file: Err, well, this file was created by > D10 2 > I11 3 > // Jim McDonald, MikeC, and Mike(of mikespub fame) taken from the > // topitems.php block of the articles module. And Richard Cave gave me > // help with the multiselect box. > D186 1 > D196 1 > D217 1 > I217 6 > \ > \ > if (empty($vars['catfilter'])) { > $vars['catfilter'] = ''; > } > \ > I260 5 > if(!empty($vars['catfilter'])) { > $cidsarray = array($vars['catfilter']); > } else { > $cidsarray = array(); > } > I263 1 > 'cids' => $cidsarray, > I274 1 > $vars['cats'] = xarModAPIFunc('categories','user','getcat'); > I289 13 > //Put together the more featured articles list > for($idx=0; $idx < count($vars['filtereditems']); ++$idx) { > $vars['filtereditems'][$idx]['selected'] = ''; > for($mx=0; $mx < count($vars['moreitems']); ++$mx) { > error_log("filtereditem=".$vars['filtereditems'][$idx]['aid']); > error_log("mid=".$vars['moreitems'][$mx]); > if (($vars['moreitems'][$mx]) == > ($vars['filtereditems'][$idx]['aid'])) { > $vars['filtereditems'][$idx]['selected'] = 'selected'; > } > } > } > $vars['morearticles'] = $vars['filtereditems']; > \ > I301 1 > $vars['catfilter'], > I311 1 > 'catfilter', > > == html/modules/articles/xartemplates/blocks/featureditemsAdmin.xd == > [email protected]|html/modules/articles/xartemplates/blocks/featureditemsAdmin.xd|20030620180147|09167|2ccc3f67 > [email protected]|html/modules/articles/xartemplates/blocks/featureditemsAdmin.xd|20030620180148|46868 > D 1.2 03/06/21 21:45:08-07:00 jbeames-rIoA2dxFqdxvvToxOdHx6mP8kLm7lcA4hIvA6WVW+J8@public.gmane.org +24 > -30 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a > C > c Fixed multi-select problem. Added filter by category. > K 29735 > O -rw-rw-rw- > P html/modules/articles/xartemplates/blocks/featureditemsAdmin.xd > ------------------------------------------------ > > D9 1 > I9 1 > <td><xar:mlstring>Category</xar:mlstring></td> > D16 8 > I23 8 > <option value="0"><xar:mlstring>All</xar:mlstring></option> > <xar:foreach in="$pubtypes" key="$pubid" value="$pubtype"> > <xar:if condition="!empty($pubtypeid) and > $pubtypeid eq $pubid"> > <option value="#$pubid#" > selected="selected">#$pubtype['descr']#</option> > <xar:else /> > <option value="#$pubid#">#$pubtype['descr']#</option> > </xar:if> > </xar:foreach> > D25 3 > I27 10 > <td><select name="catfilter" id="catfilter"> > <option value="0"><xar:mlstring>All</xar:mlstring></option> > <xar:foreach in="$cats" key="$cat['cid']" value="$cat"> > <xar:if condition="!empty($catfilter) and $catfilter eq > $cat['cid']"> > <option value="#$cat['cid']#" > selected="selected">#$cat['name']#</option> > <xar:else /> > <option value="#$cat['cid']#">#$cat['name']#</option> > </xar:if> > </xar:foreach> > </select></td> > D73 2 > D80 14 > I93 5 > <select name="moreitems[]" tabindex="5" multiple > size=#$itemlimit#> > <xar:loop name="$morearticles"> > <option name="aid" value="#$loop:item['aid']#" > #$loop:item['selected']#>#$loop:item['title']#</option> > </xar:loop> > </select> > D96 2 > > == BitKeeper/etc/logging_ok == > [email protected]|BitKeeper/etc/logging_ok|20020928132559|02556|36872ac13653ac68 > [email protected]|BitKeeper/etc/logging_ok|20030611175221|01494 > D 1.88 03/06/21 21:45:15-07:00 jbeames-rIoA2dxFqdxvvToxOdHx6mP8kLm7lcA4hIvA6WVW+J8@public.gmane.org +1 -0 > B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a > C > c Logging to [email protected] accepted > K 5186 > O -rw-rw-r-- > P BitKeeper/etc/logging_ok > ------------------------------------------------ > > I39 1 > jbeames-rIoA2dxFqdxvvToxOdHx6mP8kLm7lcA4hIvA6WVW+J8@public.gmane.org > > # Patch checksum=c19a032a -- Marcel van der Boom, HS-Development BV Kwartiersedijk 14B, 4893 RE Fijnaart, The Netherlands T: +31-168-468822, F: +31-168-468823