ここの情報は古いです。ご理解頂いた上でお取り扱いください。

Changeset 762


Ignore:
Timestamp:
Nov 17, 2006, 7:26:05 PM (14 years ago)
Author:
ebihara
Message:

r754のマージ

Location:
OpenPNE/branches/ebihara/dev_2_6
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/branches/ebihara/dev_2_6/webapp/lib/util/cache.php

    r749 r762  
    146146/**
    147147 * プロフィール取得のfunction cacheを削除する
     148 * 旧関数名を呼んでいる限り引数の省略はないのでこれで暫定的な対応とする
    148149 */
    149150function cache_drop_c_member_profile($c_member_id)
     
    151152    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id);
    152153    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, false, false, 'public');
     154    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, false, false, 'friend');
     155    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, false, false, 'private');
     156    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, false, true, 'public');
     157    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, false, true, 'friend');
     158    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, false, true, 'private');
     159    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, true, false, 'public');
     160    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, true, false, 'friend');
     161    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, true, false, 'private');
     162    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, true, true, 'public');
     163    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, true, true, 'friend');
     164    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, true, true, 'private');
    153165    pne_cache_drop('db_member_c_profile_list');
    154166}
  • OpenPNE/branches/ebihara/dev_2_6/webapp_biz/modules/biz/templates/fh_biz_schedule_view.tpl

    r731 r762  
    253253<img src="./skin/dummy.gif" class="v_spacer_m">
    254254
     255({if $is_f})
    255256<table border="0" cellspacing="0" cellpadding="0">
    256257<tr>
     
    258259<td class="padding_ss" align="left">
    259260
    260 ({t_form _method=get m=biz a=page_fh_biz_schedule_calendar})
    261 <input type="hidden" name="target_id" value="({$target_c_member_id})">
    262 <input type="hidden" name="year" value="({$schedule.begin_date|date_format:'%Y'})">
    263 <input type="hidden" name="month" value="({$schedule.begin_date|date_format:'%m'})">
    264 <input value="月間カレンダーを表示する" type="submit" class="submit">
     261({t_form _method=get m=pc a=page_h_home})
     262<input value="マイホームに戻る" type="submit" class="submit">
    265263</form>
    266264
     
    285283
    286284</td>
    287 
     285</tr>
     286</table>
     287({elseif !$msg})
     288<table border="0" cellspacing="0" cellpadding="0">
     289<tr>
     290<td class="padding_ss" align="left">
     291
     292({t_form _method=get m=pc a=page_h_home})
     293<input value="マイホームに戻る" type="submit" class="submit">
     294</form>
     295
     296</td>
     297
     298<td class="padding_ss" align="center">
     299
     300({t_form m=biz a=page_fh_biz_schedule_edit})
     301<input type="hidden" name="rep_type" value="({$schedule.rep_type})">
     302<input type="hidden" name="begin_date" value="({$schedule.begin_date})">
     303<input type="hidden" name="begin_time" value="({$schedule.begin_time})">
     304<input type="hidden" name="finish_date" value="({$schedule.finish_date})">
     305<input type="hidden" name="finish_time" value="({$schedule.finish_time})">
     306<input type="hidden" name="title" value="({$schedule.title})">
     307<input type="hidden" name="value" value="({$schedule.value})">
     308<input type="hidden" name="members" value="({$jmembers_enc})">
     309<input type="hidden" name="schedule_id" value="({$schedule_id})">
     310<input value="修正する" type="submit" class="submit">
     311</form>
     312
     313</td>
    288314<td class="padding_ss" align="left">
    289315
     
    295321</td>
    296322</tr>
    297 
    298323({if $schedule.rep_first})
    299324<tr>
     
    305330</tr>
    306331({/if})
    307 </form>
    308 </table>
     332
     333</form>
     334</table>
     335({else})
     336<table border="0" cellspacing="0" cellpadding="0">
     337<tr>
     338<td class="padding_ss" align="right">
     339
     340({t_form m=biz a=page_fh_biz_schedule_add})
     341<input value="新規の予定登録をする" type="submit" class="submit">
     342</form>
     343
     344</td>
     345<td class="padding_ss" align="center">
     346
     347({t_form m=biz a=page_s_list})
     348<input type="hidden" name="w" value="({$w})">
     349<input value="施設予約をする" type="submit" class="submit">
     350</form>
     351
     352</td>
     353<td class="padding_ss" align="left">
     354
     355({t_form _method=get m=pc a=page_h_home})
     356<input value="マイホームに戻る" type="submit" class="submit">
     357</form>
     358
     359</td>
     360</tr>
     361</table>
     362({/if})
    309363
    310364<img src="./skin/dummy.gif" class="v_spacer_m">
  • OpenPNE/branches/ebihara/dev_2_6/webapp_biz/modules/biz/templates/inc_biz_schedule_week.tpl

    r737 r762  
    209209({* スケジュール(時間有) *})
    210210({foreach from=$item.schedule item=item_schedule name=schedule})
    211 
    212 ({* 時刻変数の初期化 *})
    213 ({assign var="begin_time_H" value=null})
    214 ({assign var="begin_time_M" value=null})
    215 ({assign var="finish_time_H" value=null})
    216 ({assign var="finish_time_M" value=null})
    217 
    218211        ({if !$item_schedule.begin_time})  <!-- 時間指定なしの予定 -->
    219212        ({elseif $cmd == 's_list'})
  • OpenPNE/branches/ebihara/dev_2_6/webapp_biz/modules/ktai_biz/templates/fh_biz_schedule_add.tpl

    r702 r762  
    99<input type="hidden" name="ksid" value="({$PHPSESSID})">
    1010
    11 予定日:<input type="text" name='sc_b_year' size="2" value="({$now.year})" istyle="4" mode="numeric">年
    12                 <input type="text" name='sc_b_month' size="2" value="({$now.month})" istyle="4" mode="numeric">月
    13                 <input type="text" name='sc_b_date' size="2" value="({$now.day})" istyle="4" mode="numeric">日<br>
     11予定日:<input type="text" name='sc_b_year' size="2" value="({$now.year})">年
     12                <input type="text" name='sc_b_month' size="2" value="({$now.month})">月
     13                <input type="text" name='sc_b_date' size="2" value="({$now.day})">日<br>
    1414               
    15 時刻:<input type="text" name='sc_b_hour' size="2" istyle="4" mode="numeric">時
    16         <input type="text" name='sc_b_minute' size="2" istyle="4" mode="numeric">分
     15時刻:<input type="text" name='sc_b_hour' size="2">時
     16        <input type="text" name='sc_b_minute' size="2">分
    1717        ~
    18         <input type="text" name='sc_f_hour' size="2" istyle="4" mode="numeric">時
    19         <input type="text" name='sc_f_minute' size="2" istyle="4" mode="numeric">分<br>
     18        <input type="text" name='sc_f_hour' size="2">時
     19        <input type="text" name='sc_f_minute' size="2">分<br>
    2020       
    2121タイトル:<input type="text" name='sc_title' size="30"><br>
Note: See TracChangeset for help on using the changeset viewer.