Changeset 9953

Show
Ignore:
Timestamp:
11/17/08 08:57:07 (2 months ago)
Author:
afz
Message:

revert Menu changes to before starting cache stuffs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/0.8/jaws/html/gadgets/Menu/AdminModel.php

    r9934 r9953  
    223223        $mid = $GLOBALS['db']->lastInsertID('menus', 'id'); 
    224224        $this->MoveMenu($mid, $gid, $gid, $pid, $pid, $rank, null); 
    225  
    226         //remove cached file 
    227         $GLOBALS['app']->Cache->delete('Menu', 'Display', $gid); 
    228         $GLOBALS['app']->Cache->delete('Menu', 'DefaultAction'); 
    229  
    230225        $GLOBALS['app']->Session->PushLastResponse($mid.'%%' . _t('MENU_NOTICE_MENU_CREATED'), RESPONSE_NOTICE); 
     226 
    231227        return true; 
    232228    } 
    …… 
    276272            return false; 
    277273        } 
    278  
    279         //remove cached file 
    280         $GLOBALS['app']->Cache->delete('Menu', 'Display', $gid); 
    281         $GLOBALS['app']->Cache->delete('Menu', 'DefaultAction'); 
    282  
    283274        $GLOBALS['app']->Session->PushLastResponse(_t('MENU_NOTICE_GROUP_UPDATED'), RESPONSE_NOTICE); 
     275 
    284276        return true; 
    285277    } 
    …… 
    327319        } 
    328320        $this->MoveMenu($mid, $gid, $oldMenu['gid'], $pid, $oldMenu['pid'], $rank, $oldMenu['rank']); 
    329  
    330         //remove cached file 
    331         $GLOBALS['app']->Cache->delete('Menu', 'Display', $gid); 
    332         $GLOBALS['app']->Cache->delete('Menu', 'DefaultAction'); 
    333  
    334321        $GLOBALS['app']->Session->PushLastResponse(_t('MENU_NOTICE_MENU_UPDATED'), RESPONSE_NOTICE); 
    335322        return true; 
    …… 
    366353        } 
    367354 
    368         //remove cached file 
    369         $GLOBALS['app']->Cache->delete('Menu', 'Display', $gid); 
    370         $GLOBALS['app']->Cache->delete('Menu', 'DefaultAction'); 
    371  
    372355        $sql = 'DELETE FROM [[menus_groups]] WHERE [id] = {gid}'; 
    373356        $res = $GLOBALS['db']->query($sql, array('gid' => $gid)); 
    …… 
    377360        } 
    378361 
    379         //remove cached file 
    380         $GLOBALS['app']->Cache->delete('Menu', 'Display', $gid); 
    381         $GLOBALS['app']->Cache->delete('Menu', 'DefaultAction'); 
    382  
    383362        $GLOBALS['app']->Session->PushLastResponse(_t('MENU_NOTICE_GROUP_DELETED', $gid), RESPONSE_NOTICE); 
     363 
    384364        return true; 
    385365    } 
    …… 
    421401            } 
    422402        } 
    423  
    424         //remove cached file 
    425         $GLOBALS['app']->Cache->delete('Menu', 'Display', $menu['gid']); 
    426         $GLOBALS['app']->Cache->delete('Menu', 'DefaultAction'); 
    427403 
    428404        return true; 

  • branches/0.8/jaws/html/gadgets/Menu/LayoutHTML.php

    r9912 r9953  
    4444    function Display($gid = 0) 
    4545    { 
    46         //cache output of this action 
    47         $GLOBALS['app']->Layout->SetCurrentActionCacheable(); 
    48  
    4946        $model = $GLOBALS['app']->LoadGadget('Menu', 'Model'); 
    5047        $group = $model->GetGroups($gid);