Changeset 9959

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

revert StaticPage? gadget changes to before starting cache stuffs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/0.8/jaws/html/gadgets/StaticPage/Actions.php

    r9933 r9959  
    1111$actions = array(); 
    1212 
    13 $actions['Index'] = array('NormalAction, LayoutAction', 
    14                           _t('STATICPAGE_LAYOUT_LIST'), 
    15                           _t('STATICPAGE_LAYOUT_LIST_DESCRIPTION')); 
     13$actions['Index'] = array('NormalAction'); 
    1614$actions['Page']  = array('NormalAction'); 
     15 
     16$actions['Display']  = array('LayoutAction',  
     17                             _t('STATICPAGE_LAYOUT_LIST'), 
     18                             _t('STATICPAGE_LAYOUT_LIST_DESCRIPTION')); 
    1719 
    1820$actions['AddPage']             = array('AdminAction'); 
    …… 
    2527$actions['EditTranslation']     = array('AdminAction'); 
    2628$actions['SaveEditTranslation'] = array('AdminAction'); 
     29?> 

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

    r9946 r9959  
    120120        } 
    121121 
    122         //rename layout action 
    123         $layoutModel = $GLOBALS['app']->LoadGadget('Layout', 'AdminModel'); 
    124         $result = $layoutModel->ChangeGadgetActionName('StaticPage', 'Display', 'Index'); 
    125         if (Jaws_Error::IsError($result)) { 
    126             return $result; 
    127         } 
    128  
    129122        return true; 
    130123    } 
    …… 
    148141            $GLOBALS['app']->Session->PushLastResponse(_t('STATICPAGE_ERROR_LANGUAGE_NOT_EXISTS', $language), RESPONSE_ERROR); 
    149142            return new Jaws_Error(_t('STATICPAGE_ERROR_LANGUAGE_NOT_EXISTS', $language), _t('STATICPAGE_NAME')); 
    150         } 
    151  
    152         $page = $this->GetPage($page_id); 
    153         if (Jaws_Error::IsError($page)) { 
    154             $GLOBALS['app']->Session->PushLastResponse(_t('STATICPAGE_ERROR_PAGE_NOT_FOUND'), RESPONSE_ERROR); 
    155             return new Jaws_Error(_t('STATICPAGE_ERROR_PAGE_NOT_FOUND'), _t('STATICPAGE_NAME')); 
    156143        } 
    157144 
    …… 
    183170        } 
    184171 
    185         //remove cached files 
    186         $GLOBALS['app']->Cache->delete('StaticPage', 'Page', $page_id); 
    187         $GLOBALS['app']->Cache->delete('StaticPage', 'Page', $page['fast_url']); 
    188  
    189172        $GLOBALS['app']->Session->PushLastResponse(_t('STATICPAGE_TRANSLATION_CREATED'), RESPONSE_NOTICE); 
    190173        return true;        
    …… 
    223206                return new Jaws_Error(_t('STATICPAGE_ERROR_TRANSLATION_EXISTS'), _t('STATICPAGE_NAME')); 
    224207            } 
    225         } 
    226  
    227         $page = $this->GetPage($translation['base_id']); 
    228         if (Jaws_Error::IsError($page)) { 
    229             $GLOBALS['app']->Session->PushLastResponse(_t('STATICPAGE_ERROR_PAGE_NOT_FOUND'), RESPONSE_ERROR); 
    230             return new Jaws_Error(_t('STATICPAGE_ERROR_PAGE_NOT_FOUND'), _t('STATICPAGE_NAME')); 
    231208        } 
    232209 
    …… 
    256233        } 
    257234 
    258         //remove cached files 
    259         $GLOBALS['app']->Cache->delete('StaticPage', 'Page', $translation['base_id']); 
    260         $GLOBALS['app']->Cache->delete('StaticPage', 'Page', $page['fast_url']); 
    261  
    262235        $GLOBALS['app']->Session->PushLastResponse(_t('STATICPAGE_TRANSLATION_UPDATED'), RESPONSE_NOTICE); 
    263236        return true;        
    …… 
    357330            return new Jaws_Error(_t('STATICPAGE_ERROR_PAGE_NOT_ADDED'), _t('STATICPAGE_NAME')); 
    358331        } 
    359  
    360         //remove cached files 
    361         $GLOBALS['app']->Cache->delete('StaticPage', 'Index'); 
    362332 
    363333        $GLOBALS['app']->Session->PushLastResponse(_t('STATICPAGE_PAGE_CREATED'), RESPONSE_NOTICE); 
    …… 
    451421            $GLOBALS['app']->Session->PushLastResponse(_t('STATICPAGE_PAGE_UPDATED'), RESPONSE_NOTICE); 
    452422        } 
    453  
    454         //remove cached files 
    455         $GLOBALS['app']->Cache->delete('StaticPage', 'Index'); 
    456         $GLOBALS['app']->Cache->delete('StaticPage', 'DefaultAction'); 
    457         $GLOBALS['app']->Cache->delete('StaticPage', 'Page', $id); 
    458         $GLOBALS['app']->Cache->delete('StaticPage', 'Page', $fast_url); 
    459  
    460423        return true; 
    461424    } 
    …… 
    470433    function DeletePage($id) 
    471434    { 
    472         $page = $this->GetPage($page_id); 
    473         if (Jaws_Error::IsError($page)) { 
    474             return new Jaws_Error(_t('STATICPAGE_ERROR_PAGE_NOT_FOUND'), _t('STATICPAGE_NAME')); 
    475         } 
    476  
    477435        $sql = 'DELETE FROM [[static_pages_translation]] WHERE [base_id] = {id}'; 
    478436        $result = $GLOBALS['db']->query($sql, array('id' => $id)); 
    …… 
    487445            return new Jaws_Error(_t('STATICPAGE_ERROR_PAGE_NOT_DELETED'), _t('STATICPAGE_NAME')); 
    488446        } 
    489  
    490         //remove cached files 
    491         $GLOBALS['app']->Cache->delete('StaticPage', 'Index'); 
    492         $GLOBALS['app']->Cache->delete('StaticPage', 'DefaultAction'); 
    493         $GLOBALS['app']->Cache->delete('StaticPage', 'Page', $id); 
    494         $GLOBALS['app']->Cache->delete('StaticPage', 'Page', $page['fast_url']); 
    495447 
    496448        $GLOBALS['app']->Session->PushLastResponse(_t('STATICPAGE_PAGE_DELETED'), RESPONSE_NOTICE); 
    …… 
    544496        } 
    545497        $GLOBALS['app']->Registry->Commit('StaticPage'); 
    546  
    547         //remove cached files 
    548         $GLOBALS['app']->Cache->delete('StaticPage', 'DefaultAction'); 
    549  
    550498        $GLOBALS['app']->Session->PushLastResponse(_t('STATICPAGE_SETTINGS_SAVED'), RESPONSE_NOTICE); 
    551499        return true; 

  • branches/0.8/jaws/html/gadgets/StaticPage/HTML.php

    r9933 r9959  
    100100        $tpl->ParseBlock('page'); 
    101101 
    102         //cache output of this action 
    103         $GLOBALS['app']->Layout->SetCurrentActionCacheable(); 
    104  
    105102        return $tpl->Get(); 
    106103    } 
    …… 
    115112    { 
    116113        $layoutGadget = $GLOBALS['app']->LoadGadget('StaticPage', 'LayoutHTML'); 
    117         return $layoutGadget->Index(); 
     114        return $layoutGadget->Display(); 
    118115    } 
    119116} 

  • branches/0.8/jaws/html/gadgets/StaticPage/Info.php

    r9933 r9959  
    1616        $this->GadgetName(_t('STATICPAGE_NAME')); 
    1717        $this->GadgetDescription(_t('STATICPAGE_DESCRIPTION')); 
    18         $this->GadgetVersion('0.8.2'); 
     18        $this->GadgetVersion('0.8.1'); 
    1919        $this->Doc('gadget/StaticPage'); 
    2020        $this->ListURL(true); 

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

    r9933 r9959  
    1717     * @return string 
    1818     */ 
    19     function Index() 
     19    function Display() 
    2020    { 
    2121        $model = $GLOBALS['app']->LoadGadget('StaticPage', 'Model'); 
    …… 
    4343        $tpl->ParseBlock('index'); 
    4444 
    45         //cache output of this action 
    46         $GLOBALS['app']->Layout->SetCurrentActionCacheable(); 
    47  
    4845        return $tpl->Get(); 
    4946    }