Author: Jonathan.Wage
Date: 2010-01-17 11:19:32 +0100 (Sun, 17 Jan 2010)
New Revision: 26757
Modified:
plugins/sfSympalPlugin/trunk/lib/cache/sfSympalSuperCache.class.php
plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfig.class.php
plugins/sfSympalPlugin/trunk/lib/core/sfSympalContext.php
plugins/sfSympalPlugin/trunk/lib/helper/SympalContentSlotHelper.php
plugins/sfSympalPlugin/trunk/lib/helper/SympalHelper.php
plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentSlot.class.php
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/routing.yml
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/form/sfSympalConfigForm.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/lib/Basesympal_adminActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/edit_slotsSuccess.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/config/sfSympalFrontendEditorPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/lib/helper/SympalContentSlotEditorHelper.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItemTable.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPagesPlugin/modules/sympal_page/templates/_view.php
plugins/sfSympalPlugin/trunk/lib/task/sfSympalConfigureTask.class.php
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/settings.yml
plugins/sfSympalPlugin/trunk/test/fixtures/project/web/.htaccess
plugins/sfSympalPlugin/trunk/test/functional/ConfigurationTest.php
Log:
[1.4][sfSympalPlugin][1.0] Making configuration write to application config
directory, improving integration with page caching so inline editing is not
used when page caching is on
Modified: plugins/sfSympalPlugin/trunk/lib/cache/sfSympalSuperCache.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/cache/sfSympalSuperCache.class.php
2010-01-17 09:18:57 UTC (rev 26756)
+++ plugins/sfSympalPlugin/trunk/lib/cache/sfSympalSuperCache.class.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -11,7 +11,7 @@
public function listenToResponseFilterContent(sfEvent $event, $content)
{
- $symfonyContext =
$this->_sympalConfiguration->getSympalContext()->getSymfonyContext();
+ $symfonyContext = sfContext::getInstance();
$response = $event->getSubject();
$request = $symfonyContext->getRequest();
Modified: plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfig.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfig.class.php
2010-01-17 09:18:57 UTC (rev 26756)
+++ plugins/sfSympalPlugin/trunk/lib/core/sfSympalConfig.class.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -59,7 +59,7 @@
return isset($theme['admin_generator_class']) ?
$theme['admin_generator_class'] :
sfSympalConfig::get('default_admin_generator_class', null,
'sfSympalDoctrineGenerator');
}
- public static function writeSetting($group, $name, $value = null)
+ public static function writeSetting($group, $name, $value = null,
$application = false)
{
if (is_null($value))
{
@@ -68,7 +68,13 @@
$group = null;
}
- $path = sfConfig::get('sf_config_dir').'/app.yml';
+ if ($application)
+ {
+ $path = sfConfig::get('sf_app_dir').'/config/app.yml';
+ } else {
+ $path = sfConfig::get('sf_config_dir').'/app.yml';
+ }
+
if (!file_exists($path))
{
touch($path);
Modified: plugins/sfSympalPlugin/trunk/lib/core/sfSympalContext.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/core/sfSympalContext.php 2010-01-17
09:18:57 UTC (rev 26756)
+++ plugins/sfSympalPlugin/trunk/lib/core/sfSympalContext.php 2010-01-17
10:19:32 UTC (rev 26757)
@@ -70,6 +70,11 @@
return $this->_site;
}
+ public function shouldLoadFrontendEditor()
+ {
+ return
$this->_symfonyContext->getConfiguration()->getPluginConfiguration('sfSympalFrontendEditorPlugin')->shouldLoadEditor();
+ }
+
public function getSiteSlug()
{
return $this->_siteSlug;
Modified: plugins/sfSympalPlugin/trunk/lib/helper/SympalContentSlotHelper.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/helper/SympalContentSlotHelper.php
2010-01-17 09:18:57 UTC (rev 26756)
+++ plugins/sfSympalPlugin/trunk/lib/helper/SympalContentSlotHelper.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -45,11 +45,11 @@
$slot->setContentRenderedFor($content);
- if (sfContext::getInstance()->getUser()->isEditMode())
+ if (sfSympalContext::getInstance()->shouldLoadFrontendEditor())
{
use_helper('SympalContentSlotEditor');
- return get_sympal_content_slot_editor($slot);
+ return get_sympal_content_slot_editor($content, $slot);
} else {
return $slot->render();
}
Modified: plugins/sfSympalPlugin/trunk/lib/helper/SympalHelper.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/helper/SympalHelper.php 2010-01-17
09:18:57 UTC (rev 26756)
+++ plugins/sfSympalPlugin/trunk/lib/helper/SympalHelper.php 2010-01-17
10:19:32 UTC (rev 26757)
@@ -91,7 +91,7 @@
$menuItem = $menuItem ? $menuItem : $sympalContext->getCurrentMenuItem();
$content = $content ? $content : $sympalContext->getCurrentContent();
- if ($user->isEditMode() && $content)
+ if ($content)
{
$menu = new sfSympalMenuTools('Sympal Editor');
Modified: plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
2010-01-17 09:18:57 UTC (rev 26756)
+++ plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -43,6 +43,12 @@
$menu = new sfSympalMenuAdminMenu('Sympal Admin');
$menu->setCredentials(array('ViewAdminBar'));
$menu->addChild('Go to Site Frontend', '@homepage');
+
+ if (sfSympalConfig::get('page_cache', 'enabled'))
+ {
+ $menu->addChild('Clear Cache', '@sympal_clear_cache');
+ }
+
$menu->addChild('My Dashboard', '@sympal_dashboard');
$menu->addChild('Content', null, array('label' => $siteTitle.' Content'));
$menu->addChild('Site Administration', null, array('label' => $siteTitle.'
Setup'));
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -183,13 +183,7 @@
public function getContentTypeClassName()
{
- $contentTypes =
sfSympalContext::getInstance()->getSympalConfiguration()->getContentTypes();
- if (isset($contentTypes[$this['content_type_id']]))
- {
- return $contentTypes[$this['content_type_id']];
- } else {
- throw new sfException('Invalid content type id
"'.$this['content_type_id'].'". Id was not found in content type cache.');
- }
+ return $this->getType()->getName();
}
public function getAllPermissions()
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentSlot.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentSlot.class.php
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentSlot.class.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -129,10 +129,8 @@
{
$value = $this->getValue();
}
-
- $user = sfContext::getInstance()->getUser();
- if ($user->isEditMode() && !$value)
+ if (sfSympalContext::getInstance()->shouldLoadFrontendEditor() && !$value)
{
$rawValue = '[Double click to enable inline edit mode]';
} else {
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -159,7 +159,7 @@
$user = sfContext::getInstance()->getUser();
- if (!$user->isEditMode())
+ if (!$user->hasCredential('ManageContent'))
{
$expr = new Doctrine_Expression('NOW()');
$q->andWhere($alias.'.date_published <= '.$expr);
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/routing.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/routing.yml
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/routing.yml
2010-01-17 10:19:32 UTC (rev 26757)
@@ -5,7 +5,11 @@
sympal_dashboard:
url: /admin/dashboard
param: { module: sympal_dashboard, action: index }
-
+
+sympal_clear_cache:
+ url: /admin/clear_cache
+ param: { module: sympal_admin, action: clear_cache }
+
sympal_publish_content:
url: /publish_content/:id
param: { module: sympal_editor, action: publish_content }
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -16,13 +16,10 @@
$user = sfContext::getInstance()->getUser();
- if ($user->isEditMode())
+ $contentTypes = Doctrine_Core::getTable('sfSympalContentType')->findAll();
+ foreach ($contentTypes as $contentType)
{
- $contentTypes =
Doctrine_Core::getTable('sfSympalContentType')->findAll();
- foreach ($contentTypes as $contentType)
- {
- $manageContent->addChild($contentType->getLabel(),
'@sympal_content_list_type?type='.$contentType->getId());
- }
+ $manageContent->addChild($contentType->getLabel(),
'@sympal_content_list_type?type='.$contentType->getId());
}
$siteAdministration = $menu->getChild('Site Administration');
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/form/sfSympalConfigForm.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/form/sfSympalConfigForm.class.php
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/form/sfSympalConfigForm.class.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -99,7 +99,7 @@
{
$array = $this->_buildArrayToWrite();
- $this->_path = sfConfig::get('sf_config_dir').'/app.yml';
+ $this->_path = sfConfig::get('sf_app_dir').'/config/app.yml';
file_put_contents($this->_path, sfYaml::dump($array, 4));
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/lib/Basesympal_adminActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/lib/Basesympal_adminActions.class.php
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_admin/lib/Basesympal_adminActions.class.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -10,6 +10,13 @@
*/
abstract class Basesympal_adminActions extends sfActions
{
+ public function executeClear_cache(sfWebRequest $request)
+ {
+ $this->clearCache();
+ $this->getUser()->setFlash('notice', 'Cache cleared successfully!');
+ $this->redirect($this->getUser()->getReferer($request->getReferer()));
+ }
+
public function executeSignin($request)
{
$user = $this->getUser();
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/lib/Basesympal_contentActions.class.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -6,12 +6,6 @@
{
parent::preExecute();
- if (!$this->getUser()->isEditMode())
- {
- $this->getUser()->setFlash('error', 'In order to work with content you
must turn on edit mode!');
- $this->redirect('@homepage');
- }
-
$this->getContext()->getEventDispatcher()->connect('admin.save_object',
array($this, 'listenToAdminSaveObject'));
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/edit_slotsSuccess.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/edit_slotsSuccess.php
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/edit_slotsSuccess.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -8,7 +8,7 @@
<fieldset id="sf_fieldset_<?php echo $slot->getName() ?>">
<h2><?php echo $slot ?></h2>
<div class="sf_admin_form_row">
- <?php echo get_sympal_content_slot($sf_sympal_content, $slot) ?>
+ <?php echo get_sympal_content_slot_editor($sf_sympal_content,
$slot) ?>
</div>
</fieldset>
<?php endif; ?>
@@ -24,4 +24,6 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
+
+<?php echo get_sympal_editor() ?>
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/config/sfSympalFrontendEditorPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/config/sfSympalFrontendEditorPluginConfiguration.class.php
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/config/sfSympalFrontendEditorPluginConfiguration.class.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -9,18 +9,19 @@
$this->dispatcher->connect('sympal.load_content', array($this,
'loadEditor'));
}
- private function _shouldLoadEditor()
+ public function shouldLoadEditor()
{
// Only load the editor if
// ... edit mode is on
// ... request format is html
return sfContext::getInstance()->getUser()->isEditMode()
- && sfContext::getInstance()->getRequest()->getRequestFormat() == 'html';
+ && sfContext::getInstance()->getRequest()->getRequestFormat() == 'html'
+ && !sfSympalConfig::get('page_cache', 'enabled');
}
public function loadEditor(sfEvent $event)
{
- if ($this->_shouldLoadEditor())
+ if ($this->shouldLoadEditor())
{
// Load the editor assets (css/js)
$this->loadEditorAssets();
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/lib/helper/SympalContentSlotEditorHelper.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/lib/helper/SympalContentSlotEditorHelper.php
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalFrontendEditorPlugin/lib/helper/SympalContentSlotEditorHelper.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -1,7 +1,9 @@
<?php
-function get_sympal_content_slot_editor(sfSympalContentSlot $slot)
+function get_sympal_content_slot_editor(sfSympalContent $content,
sfSympalContentSlot $slot)
{
+ $slot->setContentRenderedFor($content);
+
$name = $slot->getName();
$isColumn = $slot->getIsColumn();
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItemTable.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItemTable.class.php
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItemTable.class.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -39,7 +39,7 @@
}
$user = sfContext::getInstance()->getUser();
- if (!$user->isEditMode())
+ if (!$user->hasCredential('ManageContent'))
{
$expr = new Doctrine_Expression('NOW()');
$q->andWhere('m.date_published <= '.$expr);
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPagesPlugin/modules/sympal_page/templates/_view.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPagesPlugin/modules/sympal_page/templates/_view.php
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPagesPlugin/modules/sympal_page/templates/_view.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -4,11 +4,4 @@
<h1><?php echo get_sympal_content_slot($content, 'title') ?></h1>
-<?php if ($sf_user->isEditMode()): ?>
- <p>
- Created by <strong><?php echo get_sympal_content_slot($content,
'created_by_id', null, 'render_content_author') ?></strong> on
- <strong><?php echo get_sympal_content_slot($content, 'date_published',
null, 'render_content_date_published') ?>.</strong>
- </p>
-<?php endif; ?>
-
<?php echo get_sympal_content_slot($content, 'body', 'Markdown') ?>
\ No newline at end of file
Modified: plugins/sfSympalPlugin/trunk/lib/task/sfSympalConfigureTask.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/task/sfSympalConfigureTask.class.php
2010-01-17 09:18:57 UTC (rev 26756)
+++ plugins/sfSympalPlugin/trunk/lib/task/sfSympalConfigureTask.class.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -9,7 +9,7 @@
));
$this->addOptions(array(
- new sfCommandOption('application', null,
sfCommandOption::PARAMETER_OPTIONAL, 'The application',
sfSympalToolkit::getDefaultApplication()),
+ new sfCommandOption('application', null,
sfCommandOption::PARAMETER_OPTIONAL, 'The application', null),
new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED,
'The environment', 'dev'),
));
@@ -40,16 +40,17 @@
$value = is_numeric($value) ? (int) $value : $value;
$value = $value == 'false' ? false : $value;
$value = $value == 'true' ? true : $value;
+ $writeToApp = isset($options['application']) && $options['application']
? true : false;
if ($group)
{
$this->logSection('sympal', sprintf('Writing setting "%s" with a value
of "%s" under the "%s" group.', $key, $value, $group));
- sfSympalConfig::writeSetting($group, $key, $value);
+ sfSympalConfig::writeSetting($group, $key, $value, $writeToApp);
} else {
$this->logSection('sympal', sprintf('Writing setting "%s" with a value
of "%s".', $key, $value, $group));
- sfSympalConfig::writeSetting($key, $value);
+ sfSympalConfig::writeSetting(null, $key, $value, $writeToApp);
}
}
}
Modified:
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
2010-01-17 10:19:32 UTC (rev 26757)
@@ -1,4 +1,16 @@
all:
sympal_config:
- # Configure forms that should have recaptcha enabled
- recaptcha_forms: [-sfGuardRegisterForm]
\ No newline at end of file
+ sfSympalBlogPlugin:
+ installed: true
+ sfSympalCommentsPlugin:
+ installed: true
+ sfSympalThemeTestPlugin:
+ installed: true
+ installed: true
+ current_version: 1.0.0-ALPHA1
+ upgrade_version_history:
+ - 0.7.0__2
+ breadcrumbs_separator: ' :: '
+ plugin_api:
+ username: test
+ password: test
Modified:
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/settings.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/settings.yml
2010-01-17 09:18:57 UTC (rev 26756)
+++
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/settings.yml
2010-01-17 10:19:32 UTC (rev 26757)
@@ -3,7 +3,7 @@
prod:
.settings:
- no_script_name: false
+ no_script_name: true
logging_enabled: false
dev:
Modified: plugins/sfSympalPlugin/trunk/test/fixtures/project/web/.htaccess
===================================================================
--- plugins/sfSympalPlugin/trunk/test/fixtures/project/web/.htaccess
2010-01-17 09:18:57 UTC (rev 26756)
+++ plugins/sfSympalPlugin/trunk/test/fixtures/project/web/.htaccess
2010-01-17 10:19:32 UTC (rev 26757)
@@ -29,4 +29,4 @@
# no, so we redirect to our front web controller
RewriteRule ^(.*)$ index.php [QSA,L]
-</IfModule>
\ No newline at end of file
+</IfModule>
Modified: plugins/sfSympalPlugin/trunk/test/functional/ConfigurationTest.php
===================================================================
--- plugins/sfSympalPlugin/trunk/test/functional/ConfigurationTest.php
2010-01-17 09:18:57 UTC (rev 26756)
+++ plugins/sfSympalPlugin/trunk/test/functional/ConfigurationTest.php
2010-01-17 10:19:32 UTC (rev 26757)
@@ -10,7 +10,7 @@
click('Save', array('settings' => array('breadcrumbs_separator' => ' :: ',
'plugin_api' => array('username' => 'test', 'password' => 'test'))))
;
-$after = sfYaml::load(sfConfig::get('sf_config_dir').'/app.yml');
+$after = sfYaml::load(sfConfig::get('sf_app_dir').'/config/app.yml');
$t = $browser->test();
$t->is($after['all']['sympal_config']['breadcrumbs_separator'], ' :: ', 'Test
breadcrumbs separator saved');
$t->is($after['all']['sympal_config']['plugin_api']['username'], 'test', 'Test
plugin_api.username saved');
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
