Dev: fixed issue #07736: Unable to update question/group order

application/config/third_party.php

@@ -106,6 +106,15 @@
             'jquery'
         )
     ),
+    'jquery-nestedSortable' => array(
+        'baseUrl' => 'third_party/jquery-nestedSortable',
+        'js' => array(
+            'jquery.mjs.nestedSortable.js'
+        ),
+        'depends' => array(
+            'jqueryui'
+        )
+    ),
     'jquery-multiselect' => array(
         'baseUrl' => 'third_party/jquery-multiselect',
         'js' => array(

application/controllers/admin/surveyadmin.php

@@ -1041,9 +1041,6 @@ private function _showReorderForm($iSurveyID)
         $aData['aGroupsAndQuestions'] = $aGrouplist;
         $aData['surveyid'] = $iSurveyID;
 
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.ui.nestedSortable.js');
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'organize.js');
-
         $this->_renderWrappedTemplate('survey', 'organizeGroupsAndQuestions_view', $aData);
     }
 

application/views/admin/survey/organizeGroupsAndQuestions_view.php

@@ -1,3 +1,7 @@
+<?php 
+    App()->getClientScript()->registerPackage('jquery-nestedSortable');
+    App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'organize.js');
+?>
 <div class='header ui-widget-header'><?php $clang->eT('Organize question groups/questions');?></div>
 <p>
     <?php $clang->eT("To reorder questions/questiongroups just drag the question/group with your mouse to the desired position.");?><br />

third_party/jquery-nestedSortable/README.md

@@ -0,0 +1,123 @@
+# nestedSortable jQuery plugin
+
+*nestedSortable* is a jQuery plugin that extends jQuery Sortable UI functionalities to nested lists.  
+*Note:* **Version 2.0** *is published in branch '2.0alpha' and is ready for testing! At the moment it has only been tested in Firefox and Chrome, if you work with IE feel free to give it a shot and let me know if something goes wrong.*
+
+## Features
+
+- Designed to work seamlessly with the [nested](http://articles.sitepoint.com/article/hierarchical-data-database "A Sitepoint tutorial on PHP, MYSQL and nested sets") [set](http://en.wikipedia.org/wiki/Nested_set_model "Wikipedia article on nested sets") model (have a look at the `toArray` method)
+- Items can be sorted in their own list, moved across the tree, or nested under other items.
+- Sublists are created and deleted on the fly
+- All jQuery Sortable options, events and methods are available
+- It is possible to define elements that will not accept a new nested item/list and a maximum depth for nested items
+- The root level can be protected
+
+## Usage
+
+```
+<ol class="sortable">
+	<li><div>Some content</div></li>
+	<li>
+		<div>Some content</div>
+		<ol>
+			<li><div>Some sub-item content</div></li>
+			<li><div>Some sub-item content</div></li>
+		</ol>
+	</li>
+	<li><div>Some content</div></li>
+</ol>
+```
+
+```
+	$(document).ready(function(){
+
+		$('.sortable').nestedSortable({
+			handle: 'div',
+			items: 'li',
+			toleranceElement: '> div'
+		});
+
+	});
+```
+
+Please note: every `<li>` must have either one or two direct children, the first one being a container element (such as `<div>` in the above example), and the (optional) second one being the nested list. The container element has to be set as the 'toleranceElement' in the options, and this, or one of its children, as the 'handle'.
+
+Also, the default list type is `<ol>`.
+
+## Custom Options
+
+<dl>
+	<dt>tabSize</dt>
+	<dd>How far right or left (in pixels) the item has to travel in order to be nested or to be sent outside its current list. Default: <b>20</b></dd>
+	<dt>disableNesting</dt>
+	<dd>The class name of the items that will not accept nested lists. Default: <b>ui-nestedSortable-no-nesting</b></dd>
+	<dt>errorClass</dt>
+	<dd>The class given to the placeholder in case of error. Default: <b>ui-nestedSortable-error</b></dd>
+	<dt>listType</dt>
+	<dd>The list type used (ordered or unordered). Default: <b>ol</b></dd>
+	<dt>maxLevels</dt>
+	<dd>The maximum depth of nested items the list can accept. If set to '0' the levels are unlimited. Default: <b>0</b></dd>
+	<dt>protectRoot</dt>
+	<dd>Wether to protect the root level (i.e. root items can be sorted but not nested, sub-items cannot become root items). Default: <b>false</b></dd>
+	<dt>rootID</dt>
+	<dd>The id given to the root element (set this to whatever suits your data structure). Default: <b>null</b></dd>
+	<dt>rtl</dt>
+	<dd>Set this to true if you have a right-to-left page. Default: <b>false</b></dd>
+	<dt>isAllowed (function)</dt>
+	<dd>You can specify a custom function to verify if a drop location is allowed. Default: <b>function(item, parent) { return true; }</b></dd>
+</dl>
+
+## Custom Methods
+
+<dl>
+	<dt>serialize</dt>
+	<dd>Serializes the nested list into a string like <b>setName[item1Id]=parentId&setName[item2Id]=parentId</b>, reading from each item's id formatted as 'setName_itemId' (where itemId is a number).
+	It accepts the same options as the original Sortable method (<b>key</b>, <b>attribute</b> and <b>expression</b>).</dd>
+	<dt>toArray</dt>
+	<dd>Builds an array where each element is in the form:
+<pre>setName[n] =>
+{
+	'item_id': itemId,
+	'parent_id': parentId,
+	'depth': depth,
+	'left': left,
+	'right': right,
+}
+</pre>
+	It accepts the same options as the original Sortable method (<b>attribute</b> and <b>expression</b>) plus the custom <b>startDepthCount</b>, that sets the starting depth number (default is <b>0</b>).</dd>
+	<dt>toHierarchy</dt>
+	<dd>Builds a hierarchical object in the form:
+<pre>'0' ...
+	'id' => itemId
+'1' ...
+	'id' => itemId
+	'children' ...
+		'0' ...
+			'id' => itemId
+		'1' ...
+			'id' => itemId
+'2' ...
+	'id' => itemId
+</pre>
+	Similarly to <code>toArray</code>, it accepts <b>attribute</b> and <b>expression</b> options.</dd>
+</dl>
+
+## Known Bugs
+
+*nestedSortable* doesn't work properly with connected draggables, because of the way Draggable simulates Sortable `mouseStart` and `mouseStop` events. This bug might or might not be fixed some time in the future (it's not specific to this plugin).
+
+## Requirements
+
+jQuery 1.4+  
+jQuery UI Sortable 1.8+
+
+## Browser Compatibility
+
+Tested with: IE 6/7/8, Firefox 3.6/4, Chrome, Safari 3
+
+## License
+
+This work is licensed under the MIT License.
+
+This work is *pizzaware*. If it saved your life, or you just feel good at heart, please consider offering me a pizza. This can be done in two ways: (1) follow [this link](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=RSJEW3N9PRMYY&lc=IT&item_name=Manuele%20Sarfatti&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted) to donate through paypal; (2) send me cash via traditional mail to my home address in Italy. Is the second method legal? It is in Italy if you use Posta assicurata. You should check with your local laws if you live elsewhere.
+