Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[21469] branches/proposed/modules/mod-calendar_new.php

[Jean-Marc L. <jea...@gm...>]

My bad: it should have been combined with my commit # 21472
Both files are part of the fix.

Jyhem

On Mon, Sep 14, 2009 at 8:52 PM, Jonny Bradley <tw...@no...> wrote:
>
> Sounds like a great idea - i spotted this oddity a few days ago - but sadly
> this fix doesn't work for me :(
>
> I set a param on the calendar_new module: "viewmode=month" but when i go to
> the calendar and select week (say) view, the module still only shows a week.
>
> Am i doing something wrong?
> Or have i missed the point?
>
> By my reckoning this (showing a month always on the module) should be
> default behaviour without params...
>
> jb
>
> On 14 Sep 2009, at 13:18, Nyloth wrote:
>
>> +1
>>
>> Nyloth
>>
>> 2009/9/14 <Jy...@us...>
>> Revision: 21469
>>         http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=21469&view=rev
>> Author:   Jyhem
>> Date:     2009-09-14 09:17:13 +0000 (Mon, 14 Sep 2009)
>>
>> Log Message:
>> -----------
>> [FIX] Lets calendar modules in month view instead of breaking them when
>> main calendar view mode changes to week, year, etc (in trunk #19102)
>>
>> Modified Paths:
>> --------------
>>   branches/proposed/modules/mod-calendar_new.php
>>
>> Modified: branches/proposed/modules/mod-calendar_new.php
>> ===================================================================
>> --- branches/proposed/modules/mod-calendar_new.php      2009-09-14
>> 08:02:34 UTC (rev 21468)
>> +++ branches/proposed/modules/mod-calendar_new.php      2009-09-14
>> 09:17:13 UTC (rev 21469)
>> @@ -16,16 +16,18 @@
>>
>>       if (isset($_REQUEST['viewmode'])) $save_viewmode =
>> $_REQUEST['viewmode'];
>>       if (!empty($module_params['viewmode']))
>> -               $_REQUEST['viewmode'] = $module_params['viewmode'];
>> +               $calendarViewMode = $module_params['viewmode'];
>> +
>>       if (isset($_REQUEST['todate'])) $save_todate = $_REQUEST['todate'];
>> +
>>       if (isset($module_params['month_delta'])) {
>> -               $_REQUEST['viewmode'] = 'month';
>> +               $calendarViewMode = 'month';
>>               include('tiki-calendar_setup.php');
>>               list($focus_day, $focus_month, $focus_year) = array(
>> -
>>                                               TikiLib::date_format("%d",
>> $focusdate),
>> -
>>                                               TikiLib::date_format("%m",
>> $focusdate),
>> -
>>                                               TikiLib::date_format("%Y",
>> $focusdate)
>> -
>>                                               );
>> +                       TikiLib::date_format("%d", $focusdate),
>> +                       TikiLib::date_format("%m", $focusdate),
>> +                       TikiLib::date_format("%Y", $focusdate)
>> +               );
>>               $_REQUEST['todate'] =
>> TikiLib::make_time(0,0,0,$focus_month+$module_params['month_delta'],1,$focus_year);
>>       }
>>
>> @@ -63,12 +65,8 @@
>>       $smarty->assign('daformat2', $tikilib->get_long_date_format());
>>       $smarty->assign('var', '');
>>       $smarty->assign('myurl', 'tiki-calendar.php');
>> -       if (isset($save_viewmode)) {
>> -               $_REQUEST['viewmode'] = $save_viewmode;
>> -       } else {
>> -               unset($_REQUEST['viewmode']);
>> -       }
>> -       if (isset($save_todate)) {
>> +
>> +       if ( isset($save_todate) ) {
>>               $_REQUEST['todate'] = $save_todate;
>>       } else {
>>               unset($_REQUEST['todate']);
>>
>>
>> This was sent by the SourceForge.net collaborative development platform,
>> the world's largest Open Source development site.
>>
>>
>> ------------------------------------------------------------------------------
>> 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
>>
>>
>> ------------------------------------------------------------------------------
>> 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
>
>