Merge pull request #7 from adrianschulz/master

Merge back

CHANGES.rst

@@ -9,6 +9,10 @@ Changelog
 - Same results-limit will be used in the view and the querybuilder.
 - The sorting for every collection will be stored in it's own sorting field.
 - "Sort on"-field has now an impact on the query & the results.
+- "Sort on"- and "Sort order"-fields will be stored separate for every collection.
+- The sorting will be updated always. Before this happend only while saving.
+- Set automatically "Sort on"-field to None (which is necessary for d&d) when d&d is executed.
+- Show correct sorting also if limit is smaller than the amount of results.
 - Fix tests
   [adrianschulz]
 

src/collective/sortedlisting/browser/results.pt

@@ -98,15 +98,14 @@
               var updateSorting = function(el, shift){
                   /* Get active modal window */
                   var modal = $('div.plone-modal-wrapper:visible').first();
-                  /*
-                  Not in use to reduce the risk of an error in the next release.
+
                   if(modal.length == 0) {
                     modal = $('div.plone-modal-wrapper.mosaic-overlay');
                   }
                   if(modal.length == 0){
                     modal = $('div#content-core');
                   }
-                  */
+
                   var sortOnSelect = modal.find(".querystring-sort-wrapper").find("select")
                   var uid = $(el).attr('data-uid');
                   var uidList = modal.find("div#search-results li").map(function() {

src/collective/sortedlisting/browser/static/bundle-sortablequerystring-compiled.js

@@ -240,11 +240,9 @@ define('sortablequerystring',[
       if(modal.length == 0) {
         modal = $('div.plone-modal-wrapper.mosaic-overlay');
       }
-      /*
       if(modal.length == 0){
         modal = $('div#content-core');
       }
-      */
 
       var sorting = modal.find("textarea[name$='.sorting']").first().val();
 
@@ -278,11 +276,9 @@ define('sortablequerystring',[
       if(modal.length == 0) {
         modal = $('div.plone-modal-wrapper.mosaic-overlay');
       }
-      /*
       if(modal.length == 0){
         modal = $('div#content-core');
       }
-      */
 
       // elements that may exist already on the page
       // XXX do this in a way so it'll work with other forms will work
@@ -333,8 +329,6 @@ define('sortablequerystring',[
             .addClass(self.options.classSortReverseLabelName)
         );
 
-      // if the form already contains the sort fields, hide them! Their values
-      // will be synced back and forth between the querystring's form elements
       if (existingSortOn.length >= 1 && existingSortOrder.length >= 1) {
         var reversed = $('.option input[type="checkbox"]', existingSortOrder).prop('checked');
         var sortOn = $('[id$="-sort_on"]', existingSortOn).val();