From patchwork Fri Sep 11 15:55:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Lespiau X-Patchwork-Id: 516876 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0F34F14012C for ; Sat, 12 Sep 2015 02:00:43 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id E8D0C1A2C1A for ; Sat, 12 Sep 2015 02:00:42 +1000 (AEST) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lists.ozlabs.org (Postfix) with ESMTP id 41BE51A2BB3 for ; Sat, 12 Sep 2015 01:56:07 +1000 (AEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 11 Sep 2015 08:56:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,511,1437462000"; d="scan'208";a="559867270" Received: from jeffzhua-mobl.amr.corp.intel.com (HELO strange.amr.corp.intel.com) ([10.254.88.85]) by FMSMGA003.fm.intel.com with ESMTP; 11 Sep 2015 08:56:06 -0700 From: Damien Lespiau To: patchwork@lists.ozlabs.org Subject: [PATCH 33/51] dynatable: Tweak dynatable to work with DRF ordering Date: Fri, 11 Sep 2015 16:55:06 +0100 Message-Id: <1441986924-26689-34-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1441986924-26689-1-git-send-email-damien.lespiau@intel.com> References: <1441986924-26689-1-git-send-email-damien.lespiau@intel.com> X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" The dynatable plugin doesn't send its ordering parameters in the way Django Rest Framework expects. Tweak a bit how dynatable crafts its Ajax URL so we can sort series. Signed-off-by: Damien Lespiau --- lib/packages/jquery/jquery.dynatable.js | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/lib/packages/jquery/jquery.dynatable.js b/lib/packages/jquery/jquery.dynatable.js index 7397110..d8d0179 100644 --- a/lib/packages/jquery/jquery.dynatable.js +++ b/lib/packages/jquery/jquery.dynatable.js @@ -214,7 +214,23 @@ // TODO: Wrap this in a try/rescue block to hide the processing indicator and indicate something went wrong if error this.processingIndicator.show(); - if (this.settings.features.sort && !$.isEmptyObject(this.settings.dataset.sorts)) { data[this.settings.params.sorts] = this.settings.dataset.sorts; } + if (this.settings.features.sort && + !$.isEmptyObject(this.settings.dataset.sorts)) { + var sorts = this.settings.dataset.sorts, + keys = this.settings.dataset.sortsKeys, + resolved_sorts = []; + + for (var k = 0; k < keys.length; k++) { + var key = keys[k]; + + if (sorts[key] === -1) + resolved_sorts.push('-' + key); + else + resolved_sorts.push(key); + } + + data[this.settings.params.sorts] = resolved_sorts.join(','); + } if (this.settings.features.paginate && this.settings.dataset.page) { var page = this.settings.dataset.page, perPage = this.settings.dataset.perPage; @@ -905,7 +921,16 @@ this.init = function() { var sortsUrl = window.location.search.match(new RegExp(settings.params.sorts + '[^&=]*=[^&]*', 'g')); if (sortsUrl) { - settings.dataset.sorts = utility.deserialize(sortsUrl)[settings.params.sorts]; + var tokens = sortsUrl[0].slice(settings.params.sorts.length+1).split(","); + + for (var t = 0; t < tokens.length; t++) { + var token = tokens[t]; + + if (token.charAt(0) === '-') + settings.dataset.sorts[token.slice(1)] = -1; + else + settings.dataset.sorts[token] = 1; + } } if (!settings.dataset.sortsKeys.length) { settings.dataset.sortsKeys = utility.keysFromObject(settings.dataset.sorts);