Author: ornicar2
Date: 2010-02-12 13:08:13 +0100 (Fri, 12 Feb 2010)
New Revision: 27938
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmContentChart.php
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmAdmin/templates/layout.php
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_flash.php
plugins/diemPlugin/trunk/dmCorePlugin/data/dm/i18n/en_fr.yml
plugins/diemPlugin/trunk/dmCorePlugin/lib/action/dmBaseActions.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/query/dmDoctrineQuery.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/record/dmDoctrineRecord.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/table/dmDoctrineTable.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/os/dmFilesystem.php
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmFront/templates/pageSuccess.php
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/_dmWidgetSearchResults.php
Log:
[Diem]
- escaped page name in default search results widget
- fixed flash messages translations in admin
- fixed dmBaseActions->download() default file_name
- added dm.content_chart.filter_modules event to allow to modify the modules
shown in the content chart
- improved performances in dmDoctrineTable by caching isI18n
- removed deprecated code in dmFilesystem
- added french translation
- changed default front layout class to dm_layout
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmContentChart.php
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmContentChart.php
2010-02-12 11:50:18 UTC (rev 27937)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmContentChart.php
2010-02-12 12:08:13 UTC (rev 27938)
@@ -44,15 +44,23 @@
{
if (null === $this->modules)
{
- $this->modules = array();
+ $modules = array();
foreach($this->serviceContainer->getService('module_manager')->getProjectModules()
as $module)
{
if ($module->hasModel() && $module->getTable()->hasField('created_at')
&& $module->getTable()->createQuery()->count())
{
- $this->modules[$module->getKey()] = $module;
+ $modules[$module->getKey()] = $module;
}
}
- $this->modules = array_merge($this->modules,
$this->getInternalModules());
+
+ $modules = array_merge($modules, $this->getInternalModules());
+
+ $this->modules =
$this->serviceContainer->getService('module_manager')->keysToModules(
+ $this->serviceContainer->getService('dispatcher')->filter(
+ new sfEvent($this, 'dm.content_chart.filter_modules',
array('modules' => $modules)),
+ array_keys($modules)
+ )->getReturnValue()
+ );
}
return $this->modules;
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmAdmin/templates/layout.php
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmAdmin/templates/layout.php
2010-02-12 11:50:18 UTC (rev 27937)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmAdmin/templates/layout.php
2010-02-12 12:08:13 UTC (rev 27938)
@@ -1,7 +1,5 @@
<?php
-$timer = dmDebug::timerOrNull('dmAdmin/templates/layout');
-
$helper = $sf_context->get('layout_helper');
echo
@@ -34,6 +32,4 @@
$helper->renderJavascripts(),
'</body>',
-'</html>';
-
-$timer && $timer->addTime();
\ No newline at end of file
+'</html>';
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_flash.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_flash.php
2010-02-12 11:50:18 UTC (rev 27937)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_flash.php
2010-02-12 12:08:13 UTC (rev 27938)
@@ -14,7 +14,7 @@
{
$html .= _tag('li.flash.ui-corner-all.'.$class,
_tag('span.icon.fleft.mr5.s16block.s16_'.$class).
- nl2br(__($message, array(), 'admin'))
+ nl2br(__($message, array()))
);
}
$html .= _close("ul");
Modified: plugins/diemPlugin/trunk/dmCorePlugin/data/dm/i18n/en_fr.yml
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/data/dm/i18n/en_fr.yml
2010-02-12 11:50:18 UTC (rev 27937)
+++ plugins/diemPlugin/trunk/dmCorePlugin/data/dm/i18n/en_fr.yml
2010-02-12 12:08:13 UTC (rev 27938)
@@ -410,4 +410,5 @@
"Signin": "Connexion"
"Signout": "Déconnexion"
"Back to admin": "Retourner à l'administration"
-"Back to site": "Retourner au site"
\ No newline at end of file
+"Back to site": "Retourner au site"
+"Invalid mime type (%mime_type%).": "Type de fichier non accepté
(%mime_type%)."
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/action/dmBaseActions.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/action/dmBaseActions.php
2010-02-12 11:50:18 UTC (rev 27937)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/action/dmBaseActions.php
2010-02-12 12:08:13 UTC (rev 27938)
@@ -152,7 +152,7 @@
if(empty($options['file_name']))
{
- $options['file_name'] =
dmString::slugify(dmConfig::get('site_name')).'-'.basename($path);
+ $options['file_name'] = basename($pathOrData);
}
}
else
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/query/dmDoctrineQuery.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/query/dmDoctrineQuery.php
2010-02-12 11:50:18 UTC (rev 27937)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/query/dmDoctrineQuery.php
2010-02-12 12:08:13 UTC (rev 27938)
@@ -85,12 +85,13 @@
* Join media for this columnName or alias
* return @dmDoctrineQuery $this
*/
- public function withDmMedia($alias)
+ public function withDmMedia($alias, $rootAlias = null)
{
- $mediaJoinAlias = dmString::lcfirst($alias);
+ $rootAlias = $rootAlias ? $rootAlias : $this->getRootAlias();
+ $mediaJoinAlias = $rootAlias.dmString::camelize($alias);
$folderJoinAlias = $mediaJoinAlias.'Folder';
- return $this->leftJoin(sprintf('%s.%s %s, %s.%s %s',
$this->getRootAlias(), $alias, $mediaJoinAlias, $mediaJoinAlias, 'Folder',
$folderJoinAlias));
+ return $this->leftJoin(sprintf('%s.%s %s, %s.%s %s', $rootAlias, $alias,
$mediaJoinAlias, $mediaJoinAlias, 'Folder', $folderJoinAlias));
}
public function whereIsActive($boolean = true, $model = null)
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/record/dmDoctrineRecord.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/record/dmDoctrineRecord.php
2010-02-12 11:50:18 UTC (rev 27937)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/record/dmDoctrineRecord.php
2010-02-12 12:08:13 UTC (rev 27938)
@@ -591,7 +591,7 @@
/*
* Add i18n capabilities
*/
- if ($fieldName != 'Translation' && $this->_table->hasI18n() &&
array_key_exists('id', $this->_data))
+ if ($fieldName !== 'Translation' && $this->_table->hasI18n() &&
array_key_exists('id', $this->_data))
{
$i18nTable = $this->_table->getI18nTable();
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/table/dmDoctrineTable.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/table/dmDoctrineTable.php
2010-02-12 11:50:18 UTC (rev 27937)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/table/dmDoctrineTable.php
2010-02-12 12:08:13 UTC (rev 27938)
@@ -6,7 +6,15 @@
$eventDispatcher, // mandatory
$moduleManager, // mandatory
$serviceContainer; // optional
-
+
+ protected
+ $hasI18n; // cache
+
+ public function construct()
+ {
+ $this->hasI18n = $this->hasRelation('Translation');
+ }
+
/**
* @return DmMediaFolder the DmMediaFolder used to store this table's
record's medias
*/
@@ -322,7 +330,7 @@
public function hasI18n()
{
- return $this->hasRelation('Translation');
+ return $this->hasI18n;
}
public function getI18nTable()
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/os/dmFilesystem.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/os/dmFilesystem.php
2010-02-12 11:50:18 UTC (rev 27937)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/os/dmFilesystem.php
2010-02-12 12:08:13 UTC (rev 27938)
@@ -75,19 +75,6 @@
return $username.":".$permissions;
}
-
-// public function execOld($command)
-// {
-// exec($command, $output, $returnCode);
-//
-// $this->lastExec = array(
-// 'command' => $command,
-// 'output' => implode("\n", $output),
-// 'return' => $returnCode
-// );
-//
-// return 0 === $returnCode;
-// }
public function exec($command, $stdoutCallback = null, $stderrCallback =
null)
{
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmFront/templates/pageSuccess.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmFront/templates/pageSuccess.php
2010-02-12 11:50:18 UTC (rev 27937)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmFront/templates/pageSuccess.php
2010-02-12 12:08:13 UTC (rev 27938)
@@ -11,7 +11,7 @@
<div id="dm_page"<?php $isEditMode && print ' class="edit"' ?>>
- <div class="layout">
+ <div class="dm_layout">
<?php echo $helper->renderArea('top', '.clearfix') ?>
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/_dmWidgetSearchResults.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/_dmWidgetSearchResults.php
2010-02-12 11:50:18 UTC (rev 27937)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/_dmWidgetSearchResults.php
2010-02-12 12:08:13 UTC (rev 27938)
@@ -29,7 +29,7 @@
_tag('span.score', ceil(100*$result->getScore()).'%').
_link($page)->text(
- _tag('span.page_name', $page->name).
+ _tag('span.page_name', escape($page->name)).
($page->description ? _tag('span.page_description', $page->description)
: '')
)
);
--
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.
