Development

Changeset 29316

You must first sign up to be able to contribute.

Changeset 29316

Show
Ignore:
Timestamp:
04/29/10 20:26:34 (3 years ago)
Author:
pmacadden
Message:

updated 1.0 branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • plugins/pmModuleEnablerPlugin/branches/1.0/README

    r24106 r29316  
    3333 
    3434        [yml] 
    35         # in apps/<app>/backend/config/settings.yml 
     35        # in apps/<app>/config/settings.yml 
    3636        enabled_modules: [default, ..., pmconfiguration, coolModule, anotherCoolModule] 
    3737 
     
    3939 
    4040        [yml] 
    41         # in apps/<app>/backend/config/app.yml 
     41        # in apps/<app>/config/app.yml 
    4242        all: 
    4343          # ... 
    44           pm_module_loader: 
     44          pm_module_enabler: 
    4545            always_enabled: [default, pmconfiguration] # this means that default and pmconfiguration modules will be always enabled 
    4646            modules_names: 
  • plugins/pmModuleEnablerPlugin/branches/1.0/lib/model/pmConfiguration.php

    r24106 r29316  
    2424  { 
    2525    $enabled_modules = sfConfig::get('sf_enabled_modules', array()); 
    26     $always_enabled = sfConfig::get('app_pm_module_loader_always_enabled', array()); 
     26    $always_enabled = sfConfig::get('app_pm_module_enabler_always_enabled', array()); 
    2727 
    2828    foreach ($enabled_modules as $enabled_module) 
     
    4747  { 
    4848    $ret = false; 
    49     $always_enabled = sfConfig::get('app_pm_module_loader_always_enabled', array()); 
     49    $always_enabled = sfConfig::get('app_pm_module_enabler_always_enabled', array()); 
    5050 
    5151    if ($module_name == 'pmconfiguration') 
     
    5555    else 
    5656    { 
    57       if (!in_array($module_name, sfConfig::get('sf_enabled_modules')) || in_array($module_name, $always_enabled)) 
     57      if (!in_array($module_name, sfConfig::get('sf_enabled_modules', array())) || in_array($module_name, $always_enabled)) 
    5858      { 
    5959        $ret = true; 
     
    6666          { 
    6767            $ret = true; 
     68 
     69            break; 
    6870          } 
    6971        } 
  • plugins/pmModuleEnablerPlugin/branches/1.0/lib/model/pmModule.php

    r25044 r29316  
    55  public function __toString() 
    66  { 
    7     $modules_names = sfConfig::get('app_pm_module_loader_modules_names', array()); 
     7    $modules_names = sfConfig::get('app_pm_module_enabler_modules_names', array()); 
    88 
    99    return array_key_exists($this->getName(), $modules_names)?$modules_names[$this->getName()]:$this->getName(); 
  • plugins/pmModuleEnablerPlugin/branches/1.0/modules/pmconfiguration/actions/actions.class.php

    r25046 r29316  
    4545    $enabled_ids = $request->getParameter('pm_configuration[enabled_ids]'); 
    4646 
    47     $all_dependencies = sfConfig::get('app_pm_module_loader_dependencies', array()); 
     47    $all_dependencies = sfConfig::get('app_pm_module_enabler_dependencies', array()); 
    4848 
    4949    foreach ($pm_configuration->getpmModules() as $pm_module)