recherche avec tags vide: cas de sortis si pas de tags

composer.json

@@ -28,7 +28,7 @@
         "gregwar/image-bundle": "dev-master",
         "cedriclombardot/admingenerator-generator-bundle": "2.1.*@dev",
         "cedriclombardot/twig-generator": "dev-master",
-        "white-october/pagerfanta-bundle": "1.0.*@dev",
+        "white-october/pagerfanta-bundle": "2.1.*@dev",
         "pagerfanta/pagerfanta": "1.0.*@dev",
         "shtumi/useful-bundle": "dev-master",
         "sonata-project/doctrine-orm-admin-bundle": "2.1.*@dev",

composer.lock

@@ -1,5 +1,5 @@
 {
-    "hash": "d7a4e5394285af2257f72f7356506599",
+    "hash": "ca864c17169224f4d52600e48be0f467",
     "packages": [
         {
             "name": "cedriclombardot/admingenerator-generator-bundle",
@@ -8,12 +8,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony2admingenerator/AdmingeneratorGeneratorBundle.git",
-                "reference": "1b2ea73c01a5b3d39ae8dd545e46966b5bb1a1e3"
+                "reference": "294adb5a1766445e2f2fd3f28c28279084c38435"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony2admingenerator/AdmingeneratorGeneratorBundle/zipball/1b2ea73c01a5b3d39ae8dd545e46966b5bb1a1e3",
-                "reference": "1b2ea73c01a5b3d39ae8dd545e46966b5bb1a1e3",
+                "url": "https://api.github.com/repos/symfony2admingenerator/AdmingeneratorGeneratorBundle/zipball/294adb5a1766445e2f2fd3f28c28279084c38435",
+                "reference": "294adb5a1766445e2f2fd3f28c28279084c38435",
                 "shasum": ""
             },
             "require": {
@@ -22,7 +22,7 @@
                 "symfony/symfony": ">= 2.1.0",
                 "twig/extensions": "dev-master",
                 "twig/twig": ">= 1.9.0",
-                "white-october/pagerfanta-bundle": "dev-master"
+                "white-october/pagerfanta-bundle": "2.1.*@dev"
             },
             "require-dev": {
                 "doctrine/common": ">=2.2.3,<2.5-dev",
@@ -33,7 +33,7 @@
                 "avalanche123/imagine-bundle": "Image manipulation using Imagine and Twig Filters",
                 "cedriclombardot/admingenerator-user-bundle": "Help you to overwrite the base layout of FOSUserBundle or others giving a parameter key of the container"
             },
-            "time": "2013-04-14 09:22:28",
+            "time": "2013-05-14 12:00:41",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -238,23 +238,23 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "2.3.3",
+            "version": "2.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "2.3.3"
+                "reference": "2.3.4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/2.3.3",
-                "reference": "2.3.3",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/2.3.4",
+                "reference": "2.3.4",
                 "shasum": ""
             },
             "require": {
                 "doctrine/common": ">=2.3.0,<2.5-dev",
                 "php": ">=5.3.2"
             },
-            "time": "2013-03-24 19:16:29",
+            "time": "2013-05-11 07:45:37",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -428,16 +428,16 @@
         },
         {
             "name": "doctrine/orm",
-            "version": "2.3.3",
+            "version": "2.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/doctrine2.git",
-                "reference": "2.3.3"
+                "reference": "2.3.4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/2.3.3",
-                "reference": "2.3.3",
+                "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/2.3.4",
+                "reference": "2.3.4",
                 "shasum": ""
             },
             "require": {
@@ -449,7 +449,7 @@
             "suggest": {
                 "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
             },
-            "time": "2013-03-24 20:43:58",
+            "time": "2013-05-11 07:51:12",
             "bin": [
                 "bin/doctrine",
                 "bin/doctrine.php"
@@ -750,19 +750,19 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Gregwar/ImageBundle.git",
-                "reference": "255d20676a53c921a7a1832d360b6eca705f5b44"
+                "reference": "d6d8c1aa8c4fe03a9b8470d2bf195c4dbf89643b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Gregwar/ImageBundle/zipball/255d20676a53c921a7a1832d360b6eca705f5b44",
-                "reference": "255d20676a53c921a7a1832d360b6eca705f5b44",
+                "url": "https://api.github.com/repos/Gregwar/ImageBundle/zipball/d6d8c1aa8c4fe03a9b8470d2bf195c4dbf89643b",
+                "reference": "d6d8c1aa8c4fe03a9b8470d2bf195c4dbf89643b",
                 "shasum": ""
             },
             "require": {
                 "ext-gd": "*",
                 "php": ">=5.3.0"
             },
-            "time": "2013-04-25 11:48:38",
+            "time": "2013-05-09 10:44:43",
             "type": "symfony-bundle",
             "autoload": {
                 "psr-0": {
@@ -1211,12 +1211,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/kriswallsmith/assetic.git",
-                "reference": "1b17f9a239276f24344f9f7d7be8293f6dca4e19"
+                "reference": "5441014f28b8fe024c547fb7a15cd737c6cb1a05"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/1b17f9a239276f24344f9f7d7be8293f6dca4e19",
-                "reference": "1b17f9a239276f24344f9f7d7be8293f6dca4e19",
+                "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/5441014f28b8fe024c547fb7a15cd737c6cb1a05",
+                "reference": "5441014f28b8fe024c547fb7a15cd737c6cb1a05",
                 "shasum": ""
             },
             "require": {
@@ -1231,9 +1231,9 @@
                 "leafo/scssphp": "*",
                 "leafo/scssphp-compass": "*",
                 "mrclay/minify": "*",
-                "phpunit/phpunit": "3.7.*",
+                "phpunit/phpunit": ">=3.7,<4.0",
                 "ptachoire/cssembed": "*",
-                "twig/twig": ">=1.6.0,<2.0"
+                "twig/twig": ">=1.6,<2.0"
             },
             "suggest": {
                 "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
@@ -1242,11 +1242,11 @@
                 "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris",
                 "twig/twig": "Assetic provides the integration with the Twig templating engine"
             },
-            "time": "2013-04-27 14:32:20",
+            "time": "2013-05-18 16:31:41",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -1338,12 +1338,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/whiteoctober/Pagerfanta.git",
-                "reference": "65c24acf84410837aa873801f5a09b4039a5735b"
+                "reference": "55544f3af5b409d4ee9d618934f4d92ef874672c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/65c24acf84410837aa873801f5a09b4039a5735b",
-                "reference": "65c24acf84410837aa873801f5a09b4039a5735b",
+                "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/55544f3af5b409d4ee9d618934f4d92ef874672c",
+                "reference": "55544f3af5b409d4ee9d618934f4d92ef874672c",
                 "shasum": ""
             },
             "require": {
@@ -1363,7 +1363,7 @@
                 "propel/propel1": "To use the PropelAdapter",
                 "solarium/solarium": "To use the SolariumAdapter."
             },
-            "time": "2013-04-24 11:37:27",
+            "time": "2013-05-16 12:46:53",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1396,23 +1396,23 @@
         },
         {
             "name": "sensio/distribution-bundle",
-            "version": "v2.1.9",
+            "version": "v2.1.10",
             "target-dir": "Sensio/Bundle/DistributionBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensio/SensioDistributionBundle.git",
-                "reference": "v2.1.9"
+                "reference": "v2.1.10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensio/SensioDistributionBundle/zipball/v2.1.9",
-                "reference": "v2.1.9",
+                "url": "https://api.github.com/repos/sensio/SensioDistributionBundle/zipball/v2.1.10",
+                "reference": "v2.1.10",
                 "shasum": ""
             },
             "require": {
                 "symfony/framework-bundle": "2.1.*"
             },
-            "time": "2013-02-04 19:54:42",
+            "time": "2013-04-09 09:20:26",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -1442,24 +1442,24 @@
         },
         {
             "name": "sensio/framework-extra-bundle",
-            "version": "v2.1.9",
+            "version": "v2.1.10",
             "target-dir": "Sensio/Bundle/FrameworkExtraBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensio/SensioFrameworkExtraBundle.git",
-                "reference": "v2.1.9"
+                "reference": "v2.1.10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensio/SensioFrameworkExtraBundle/zipball/v2.1.9",
-                "reference": "v2.1.9",
+                "url": "https://api.github.com/repos/sensio/SensioFrameworkExtraBundle/zipball/v2.1.10",
+                "reference": "v2.1.10",
                 "shasum": ""
             },
             "require": {
                 "doctrine/common": ">=2.1,<2.5-dev",
                 "symfony/framework-bundle": "2.1.*"
             },
-            "time": "2013-02-22 17:57:31",
+            "time": "2013-04-05 06:59:04",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -1489,17 +1489,17 @@
         },
         {
             "name": "sensio/generator-bundle",
-            "version": "v2.1.9",
+            "version": "v2.1.10",
             "target-dir": "Sensio/Bundle/GeneratorBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensio/SensioGeneratorBundle.git",
-                "reference": "v2.1.9"
+                "reference": "v2.1.10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensio/SensioGeneratorBundle/zipball/v2.1.9",
-                "reference": "v2.1.9",
+                "url": "https://api.github.com/repos/sensio/SensioGeneratorBundle/zipball/v2.1.10",
+                "reference": "v2.1.10",
                 "shasum": ""
             },
             "require": {
@@ -1511,7 +1511,7 @@
                 "symfony/doctrine-bridge": "2.1.*",
                 "twig/twig": ">=1.8,<2.0-dev"
             },
-            "time": "2013-01-04 17:09:08",
+            "time": "2013-04-01 18:11:18",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -1589,12 +1589,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataAdminBundle.git",
-                "reference": "c611614f23d5d42257747ae81bcc36df86216bae"
+                "reference": "2.1.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/c611614f23d5d42257747ae81bcc36df86216bae",
-                "reference": "c611614f23d5d42257747ae81bcc36df86216bae",
+                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/2.1.0",
+                "reference": "2.1.0",
                 "shasum": ""
             },
             "require": {
@@ -1665,12 +1665,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataBlockBundle.git",
-                "reference": "3f18e2df3171bb1149f55ffcb34ecc41169bf15f"
+                "reference": "2.1.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataBlockBundle/zipball/3f18e2df3171bb1149f55ffcb34ecc41169bf15f",
-                "reference": "3f18e2df3171bb1149f55ffcb34ecc41169bf15f",
+                "url": "https://api.github.com/repos/sonata-project/SonataBlockBundle/zipball/2.1.2",
+                "reference": "2.1.2",
                 "shasum": ""
             },
             "require": {
@@ -1780,16 +1780,16 @@
         },
         {
             "name": "sonata-project/exporter",
-            "version": "1.2.1",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/exporter.git",
-                "reference": "1.2.1"
+                "reference": "1.2.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/exporter/zipball/1.2.1",
-                "reference": "1.2.1",
+                "url": "https://api.github.com/repos/sonata-project/exporter/zipball/1.2.2",
+                "reference": "1.2.2",
                 "shasum": ""
             },
             "require": {
@@ -1803,7 +1803,7 @@
                 "ext-curl": "*",
                 "symfony/routing": "*"
             },
-            "time": "2013-03-04 14:20:46",
+            "time": "2013-05-02 17:17:04",
             "type": "library",
             "autoload": {
                 "psr-0": {
@@ -2114,17 +2114,17 @@
         },
         {
             "name": "symfony/swiftmailer-bundle",
-            "version": "v2.1.9",
+            "version": "v2.1.10",
             "target-dir": "Symfony/Bundle/SwiftmailerBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/SwiftmailerBundle.git",
-                "reference": "v2.1.9"
+                "reference": "v2.1.10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/v2.1.9",
-                "reference": "v2.1.9",
+                "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/v2.1.10",
+                "reference": "v2.1.10",
                 "shasum": ""
             },
             "require": {
@@ -2304,26 +2304,26 @@
         },
         {
             "name": "twig/twig",
-            "version": "v1.12.3",
+            "version": "v1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fabpot/Twig.git",
-                "reference": "v1.12.3"
+                "reference": "v1.13.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.12.3",
-                "reference": "v1.12.3",
+                "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.13.0",
+                "reference": "v1.13.0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2.4"
             },
-            "time": "2013-04-08 12:40:11",
+            "time": "2013-05-10 15:12:43",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-master": "1.13-dev"
                 }
             },
             "autoload": {
@@ -2353,7 +2353,7 @@
         },
         {
             "name": "white-october/pagerfanta-bundle",
-            "version": "dev-master",
+            "version": "2.1.x-dev",
             "target-dir": "WhiteOctober/PagerfantaBundle",
             "source": {
                 "type": "git",

src/Muzich/CoreBundle/Searcher/ElementSearcherQueryBuilder.php

@@ -219,6 +219,18 @@ class ElementSearcherQueryBuilder
     // Recherche strict ou non ?
     if ($this->es->getTagStrict() && count(($tags = $this->es->getTags())) && $this->es->getTags() != '[]')
     {
+      if (is_null($tags) && !count($tags))
+      {
+        return;
+      }
+      
+      if (is_string($tags))
+      {
+        if (is_null(trim($tags)))
+        {
+          return;
+        }
+      }
       // On a besoin de récupérer la liste des element_id qui ont les tags
       // demandés.
       $tag_ids = '';

web/bundles/admingeneratorgenerator/js/admingenerator/general.js

@@ -1,10 +1,30 @@
 $(document).ready(function(){
     // Enable tooltips
-    $('a[rel="tooltip"]').tooltip();
+    $('td.actions button[rel="tooltip"]').tooltip();
     
-    // Enable confirm on object actions
-    $("td.actions a[data-confirm]").click(function(e) {
-        e.preventDefault();        
-    	if(confirm($(this).data('confirm'))) { window.location.href = $(this).attr('href'); }
+    // Convert object action buttons into POST requests
+    $("td.actions button, .form-actions .btn-toolbar button").click(function(e) {
+        e.preventDefault();
+        
+        // Create hidden form
+        var form = $('<form />').attr({
+            method: 'POST',
+            action: $(this).data('action'),
+            style:  'visibility: hidden'
+        }).appendTo($('body'));
+        
+        if($(this).data('csrf-token')) {
+            // Add csrf protection token
+            $('<input />').attr({
+                type:   'hidden',
+                name:   '_csrf_token',
+                value:  $(this).data('csrf-token')
+            }).appendTo(form);
+        }
+        
+        // Submit POST request, if required promt for confirmation
+        if(!$(this).data('confirm') || confirm($(this).data('confirm'))) {
+            form.submit();
+        }
     });
-});
+});

web/bundles/admingeneratorgenerator/js/jquery-bbq/jquery.deparam.js

@@ -0,0 +1,97 @@
+/*
+  jQuery deparam is an extraction of the deparam method from Ben Alman's jQuery BBQ
+  http://benalman.com/projects/jquery-bbq-plugin/
+*/
+(function ($) {
+  $.deparam = function (params, coerce) {
+    var obj = {},
+        coerce_types = { 'true': !0, 'false': !1, 'null': null };
+      
+    // Iterate over all name=value pairs.
+    $.each(params.replace(/\+/g, ' ').split('&'), function (j,v) {
+      var param = v.split('='),
+          key = decodeURIComponent(param[0]),
+          val,
+          cur = obj,
+          i = 0,
+            
+          // If key is more complex than 'foo', like 'a[]' or 'a[b][c]', split it
+          // into its component parts.
+          keys = key.split(']['),
+          keys_last = keys.length - 1;
+        
+      // If the first keys part contains [ and the last ends with ], then []
+      // are correctly balanced.
+      if (/\[/.test(keys[0]) && /\]$/.test(keys[keys_last])) {
+        // Remove the trailing ] from the last keys part.
+        keys[keys_last] = keys[keys_last].replace(/\]$/, '');
+          
+        // Split first keys part into two parts on the [ and add them back onto
+        // the beginning of the keys array.
+        keys = keys.shift().split('[').concat(keys);
+          
+        keys_last = keys.length - 1;
+      } else {
+        // Basic 'foo' style key.
+        keys_last = 0;
+      }
+        
+      // Are we dealing with a name=value pair, or just a name?
+      if (param.length === 2) {
+        val = decodeURIComponent(param[1]);
+          
+        // Coerce values.
+        if (coerce) {
+          val = val && !isNaN(val)              ? +val              // number
+              : val === 'undefined'             ? undefined         // undefined
+              : coerce_types[val] !== undefined ? coerce_types[val] // true, false, null
+              : val;                                                // string
+        }
+          
+        if ( keys_last ) {
+          // Complex key, build deep object structure based on a few rules:
+          // * The 'cur' pointer starts at the object top-level.
+          // * [] = array push (n is set to array length), [n] = array if n is 
+          //   numeric, otherwise object.
+          // * If at the last keys part, set the value.
+          // * For each keys part, if the current level is undefined create an
+          //   object or array based on the type of the next keys part.
+          // * Move the 'cur' pointer to the next level.
+          // * Rinse & repeat.
+          for (; i <= keys_last; i++) {
+            key = keys[i] === '' ? cur.length : keys[i];
+            cur = cur[key] = i < keys_last
+              ? cur[key] || (keys[i+1] && isNaN(keys[i+1]) ? {} : [])
+              : val;
+          }
+            
+        } else {
+          // Simple key, even simpler rules, since only scalars and shallow
+          // arrays are allowed.
+            
+          if ($.isArray(obj[key])) {
+            // val is already an array, so push on the next value.
+            obj[key].push( val );
+              
+          } else if (obj[key] !== undefined) {
+            // val isn't an array, but since a second value has been specified,
+            // convert val into an array.
+            obj[key] = [obj[key], val];
+              
+          } else {
+            // val is a scalar.
+            obj[key] = val;
+          }
+        }
+          
+      } else if (key) {
+        // No value was defined, so set something meaningful.
+        obj[key] = coerce
+          ? undefined
+          : '';
+      }
+    });
+      
+    return obj;
+  };
+})(jQuery);

web/bundles/muzichcore/css/main.css

@@ -971,8 +971,8 @@ ul#favorite_tags li
 
 #registration_link, #login_link
 {
-  margin-right: -10px;
-  margin-top: -68px;
+  margin-right: -112px;
+  margin-top: -76px;
 }
 
 #element_add_link img, #element_add_close_link img, #group_add_link img, #group_add_link_disabled img, #group_add_close_link img, #registration_link img, #login_link img
@@ -2207,3 +2207,16 @@ div#helpbox div.center input.button
 {
   float: none;
 }
+
+div#facebook_login
+{
+  float: right;
+  margin-bottom: 0;
+  margin-right: 0;
+  margin-top: -5px;
+}
+
+div#login_box
+{
+  margin-top: 23px;
+}

web/bundles/muzichcore/js/muzich.js

@@ -3171,12 +3171,17 @@ function open_connection_or_subscription_window(open_login_part)
         }
       });
       
+      $('div#facebook_login').prependTo('div#helpbox');
+      $('div#facebook_login').show();
+      
     });
   }
 }
 
 function close_popin()
 {
+  $('div#facebook_login').hide();
+  $('div#facebook_login').appendTo('body');
   // Fond gris
   $('#fade').fadeOut(1000, function(){$('#fade').remove();});
   // On cache le lecteur