Author: Jonathan.Wage
Date: 2010-01-13 21:33:23 +0100 (Wed, 13 Jan 2010)
New Revision: 26581

Added:
   
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/templates/_switch_site.php
   plugins/sfSympalPlugin/trunk/web/images/go_icon.gif
Removed:
   
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/templates/_go_to.php
Modified:
   
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/config/generator.yml
   
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/lib/Basesympal_menu_itemsActions.class.php
Log:
[1.4][sfSympalPlugin][1.0] Fixing menu items site restriction and enhancing 
site list button for switching sites


Modified: 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/config/generator.yml
===================================================================
--- 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/config/generator.yml
      2010-01-13 20:14:48 UTC (rev 26580)
+++ 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/config/generator.yml
      2010-01-13 20:33:23 UTC (rev 26581)
@@ -14,7 +14,7 @@
       actions: ~
       fields: ~
       list:
-        display: [=title, description, _go_to]
+        display: [=title, description, _switch_site]
       filter:
         class: false
       form:

Deleted: 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/templates/_go_to.php
===================================================================
--- 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/templates/_go_to.php
      2010-01-13 20:14:48 UTC (rev 26580)
+++ 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/templates/_go_to.php
      2010-01-13 20:33:23 UTC (rev 26581)
@@ -1,3 +0,0 @@
-<?php if ($sf_sympal_site->slug != sfConfig::get('sf_app')): ?>
-  <?php echo sympal_link_to_site($sf_sympal_site->slug, 'Open', 'admin/sites') 
?>
-<?php endif; ?>
\ No newline at end of file

Added: 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/templates/_switch_site.php
===================================================================
--- 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/templates/_switch_site.php
                                (rev 0)
+++ 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/templates/_switch_site.php
        2010-01-13 20:33:23 UTC (rev 26581)
@@ -0,0 +1,3 @@
+<?php if ($sf_sympal_site->slug != sfConfig::get('sf_app')): ?>
+  <?php echo sympal_link_to_site($sf_sympal_site->slug, 
image_tag('/sfSympalPlugin/images/go_icon.gif'), 'admin/sites') ?>
+<?php endif; ?>
\ No newline at end of file


Property changes on: 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_sites/templates/_switch_site.php
___________________________________________________________________
Added: svn:executable
   + *

Modified: 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/lib/Basesympal_menu_itemsActions.class.php
===================================================================
--- 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/lib/Basesympal_menu_itemsActions.class.php
    2010-01-13 20:14:48 UTC (rev 26580)
+++ 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/modules/sympal_menu_items/lib/Basesympal_menu_itemsActions.class.php
    2010-01-13 20:33:23 UTC (rev 26581)
@@ -7,8 +7,16 @@
     parent::preExecute();
 
     $this->loadAdminTheme();
+
+    $this->getContext()->getEventDispatcher()->connect('admin.build_query', 
array($this, 'listenToAdminBuildQuery'));
   }
 
+  public function listenToAdminBuildQuery(sfEvent $event, Doctrine_Query 
$query)
+  {
+    $query->andWhere('site_id = ?', 
sfSympalContext::getInstance()->getSite()->getId());
+    return $query;
+  }
+
   protected function processForm(sfWebRequest $request, sfForm $form)
   {
     $form->bind($request->getParameter($form->getName()), 
$request->getFiles($form->getName()));

Added: plugins/sfSympalPlugin/trunk/web/images/go_icon.gif
===================================================================
(Binary files differ)


Property changes on: plugins/sfSympalPlugin/trunk/web/images/go_icon.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

-- 
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.


Reply via email to