diff --git a/library/ZendAfi/View/Helper/FormSortableConnectLists.php b/library/ZendAfi/View/Helper/FormSortableConnectLists.php index 28471777e33b68e641188ad9b82111094c4ecb98..2eed1689e0075050156b0e877d101fc8371dfd7f 100644 --- a/library/ZendAfi/View/Helper/FormSortableConnectLists.php +++ b/library/ZendAfi/View/Helper/FormSortableConnectLists.php @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE * along with AFI-OPAC 2.0; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ class ZendAfi_View_Helper_FormSortableConnectLists extends ZendAfi_View_Helper_BaseHelper { @@ -43,9 +43,9 @@ class ZendAfi_View_Helper_FormSortableConnectLists extends ZendAfi_View_Helper_B } $output = $this->view->formHidden($name, $value); - $output .= $this->renderList($this->view->_('Filtres disponibles'), $available_values); $output .= $this->renderList($this->view->_('Filtres activés'), $enabled_values); - + $output .= $this->renderList($this->view->_('Filtres disponibles'), $available_values); + Class_ScriptLoader::getInstance() ->addOPACScript('input_connect_list/input_connect_list') ->addOPACStyleSheet('../js/input_connect_list/input_connect_list') diff --git a/public/opac/js/input_connect_list/input_connect_list.js b/public/opac/js/input_connect_list/input_connect_list.js index c952cf7e953d52f24b625b3c0221b4264d57cc03..317a2694995918a94b9b959df7647458dfb63773 100644 --- a/public/opac/js/input_connect_list/input_connect_list.js +++ b/public/opac/js/input_connect_list/input_connect_list.js @@ -27,7 +27,7 @@ lists.sortable({ connectWith: lists, update: function() { - var values = $(lists[1]).sortable("toArray", { + var values = $(lists[0]).sortable("toArray", { attribute: "data-value" }); input.val( values.join(';') ); diff --git a/tests/application/modules/admin/controllers/AccueilControllerCalendarTest.php b/tests/application/modules/admin/controllers/AccueilControllerCalendarTest.php index 85b72e3716f11ac975b788b32d3591449e8c2037..5fd9fd26b1579aade2efb4be97ae5209f37ca9f5 100644 --- a/tests/application/modules/admin/controllers/AccueilControllerCalendarTest.php +++ b/tests/application/modules/admin/controllers/AccueilControllerCalendarTest.php @@ -105,28 +105,28 @@ class Admin_AccueilControllerCalendarTestWithDefaultDiaporamaNavigation extends /** @test */ - public function firstListShouldContainsOnlyOneElement() { - $this->assertXPathCount('//div[@id="input_enabled_filters"]/div[1]/ul/li', 1, $this->_response->getBody()); + public function secondListShouldContainsOnlyOneElement() { + $this->assertXPathCount('//div[@id="input_enabled_filters"]/div[2]/ul/li', 1, $this->_response->getBody()); } /** @test */ - public function firstListShouldContainsTheme() { - $this->assertXPathContentContains('//div[@id="input_enabled_filters"]/div[1]/ul/li[@data-value="custom_field_2"]', 'Theme'); + public function secondListShouldContainsTheme() { + $this->assertXPathContentContains('//div[@id="input_enabled_filters"]/div[2]/ul/li[@data-value="custom_field_2"]', 'Theme'); } /** @test */ - public function secondListShouldContainsThreeElements() { - $this->assertXPathCount('//div[@id="input_enabled_filters"]/div[2]/ul/li', 3); + public function firstListShouldContainsThreeElements() { + $this->assertXPathCount('//div[@id="input_enabled_filters"]/div[1]/ul/li', 3); } /** @test */ - public function secondListShouldContainsMonthPlaceAndPublic() { - $this->assertXPathContentContains('//div[@id="input_enabled_filters"]/div[2]/ul/li[@data-value="custom_field_1"]', 'Public'); - $this->assertXPathContentContains('//div[@id="input_enabled_filters"]/div[2]/ul/li[@data-value="date"]', 'Mois'); - $this->assertXPathContentContains('//div[@id="input_enabled_filters"]/div[2]/ul/li[@data-value="place"]', 'Lieu'); + public function firstListShouldContainsMonthPlaceAndPublic() { + $this->assertXPathContentContains('//div[@id="input_enabled_filters"]/div[1]/ul/li[@data-value="custom_field_1"]', 'Public'); + $this->assertXPathContentContains('//div[@id="input_enabled_filters"]/div[1]/ul/li[@data-value="date"]', 'Mois'); + $this->assertXPathContentContains('//div[@id="input_enabled_filters"]/div[1]/ul/li[@data-value="place"]', 'Lieu'); } }