diff --git a/VERSION b/VERSION index 7fe79f6bd..fd695df1a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -nursix-dev-5448-gfd50e444c (2022-07-18 15:07:17) +nursix-dev-5449-gdea16f46c (2022-07-18 21:35:54) diff --git a/static/scripts/S3/s3.ui.datatable.js b/static/scripts/S3/s3.ui.datatable.js index b53e80685..adca0ce99 100644 --- a/static/scripts/S3/s3.ui.datatable.js +++ b/static/scripts/S3/s3.ui.datatable.js @@ -1742,7 +1742,7 @@ if (oSetting) { - var args = 'id=' + self.tableid, + var args = 'id=' + self.tableID, sSearch = oSetting.oPreviousSearch.sSearch, aaSort = oSetting.aaSorting, aaSortFixed = oSetting.aaSortingFixed, diff --git a/static/scripts/S3/s3.ui.datatable.min.js b/static/scripts/S3/s3.ui.datatable.min.js index 2facd84e6..028565763 100644 --- a/static/scripts/S3/s3.ui.datatable.min.js +++ b/static/scripts/S3/s3.ui.datatable.min.js @@ -244,7 +244,7 @@ u=x('').data({level:""+r,group:""+u}).addClass("level_"+r);var " ("+A[p]+")":(B+=p,null!=A[B]&&(S=" ("+A[B]+")"));w.append(p+S);F&&D&&(p=K.groupIcon|0,p=p.length>=r?p[r-1]:"icon",A=x('').appendTo(w),D=x('').hide().appendTo(w),"text"==p?(A.text("\u2192"),D.text("\u2193")):"icon"==p&&(A.addClass("ui-icon ui-icon-arrowthick-1-e"),D.addClass("ui-icon ui-icon-arrowthick-1-s")));J?u.insertAfter(m):u.insertBefore(m);K.groupSpacing&&(m=u.prevAll("tr.group").first(),m.length&&m.data("level")==r&&(m=m.data("group"), z=x("").attr("colspan",z),z=x('').append(z),F&&z.addClass("collapsable"),z.addClass("xgroup_"+r+"_"+m).insertBefore(u)))},_toggleGroup:function(m,p){switch(this.tableConfig.shrinkGroupedRows){case "individual":p?this._expandGroup(m):this._collapseGroup(m);break;case "accordion":if(p){this._expandGroup(m);p=".level_"+m.data("level");var r=m.data("parentGroup");r&&(p+=".xgroup_"+m.data("parentLevel")+"_"+r);var u=this;m.siblings("tr.group"+p).each(function(){u._collapseGroup(x(this))})}else this._collapseGroup(m)}}, _expandGroup:function(m){var p=m.data("level"),r=m.data("group");m.siblings("tr.xgroup_"+p+"_"+r).show();x(".group-expand, .group-closed",m).hide();x(".group-collapse, .group-opened",m).show()},_collapseGroup:function(m){var p=m.data("level"),r=m.data("group"),u=this;m.siblings("tr.xgroup_"+p+"_"+r).each(function(){var w=x(this);w.hasClass("group")&&u._collapseGroup(w);w.hide()});x(".group-expand, .group-closed",m).show();x(".group-collapse, .group-opened",m).hide()},_exportFormat:function(){var m= -x(this.element),p=this;return function(){var r=m.dataTable().fnSettings(),u=x(this).data("url"),w=x(this).data("extension");if(r){var z="id="+p.tableid,A=r.oPreviousSearch.sSearch,B=r.aaSorting,D=r.aaSortingFixed;r=r.aoColumns;A&&(z+="&sSearch="+A+"&iColumns="+r.length);null!==D&&(B=D.concat(B));r.forEach(function(J,K){J.bSortable||(z+="&bSortable_"+K+"=false")});z+="&iSortingCols="+B.length;B.forEach(function(J,K){z+="&iSortCol_"+K+"="+B[K][0]+"&sSortDir_"+K+"="+B[K][1]});u=M(u,w,z)}else u=M(u,w); +x(this.element),p=this;return function(){var r=m.dataTable().fnSettings(),u=x(this).data("url"),w=x(this).data("extension");if(r){var z="id="+p.tableID,A=r.oPreviousSearch.sSearch,B=r.aaSorting,D=r.aaSortingFixed;r=r.aoColumns;A&&(z+="&sSearch="+A+"&iColumns="+r.length);null!==D&&(B=D.concat(B));r.forEach(function(J,K){J.bSortable||(z+="&bSortable_"+K+"=false")});z+="&iSortingCols="+B.length;B.forEach(function(J,K){z+="&iSortCol_"+K+"="+B[K][0]+"&sSortDir_"+K+"="+B[K][1]});u=M(u,w,z)}else u=M(u,w); x.searchDownloadS3!==L?x.searchDownloadS3(u,"_blank"):window.open(u)}},_initExportFormats:function(){var m=this._parseConfig();if(m!==L&&(m=m.ajaxUrl)&&S3.search!==L){var p=document.createElement("a");p.href=m;if(p.search){var r=p.search.slice(1).split("&").map(function(u){u=u.split("=");return[decodeURIComponent(u[0]),decodeURIComponent(u[1])]}).filter(function(u){return-1!=u[0].indexOf(".")});x(this.element).closest(".dt-wrapper").find(".dt-export").each(function(){var u=x(this),w=u.data("url"); w&&u.data("url",S3.search.filterURL(w,r))})}}},_bindEvents:function(){var m=x(this.element),p=this.eventNamespace,r=this;m.on("click"+p,".dt-truncate .ui-icon-zoomin, .dt-truncate .ui-icon-zoomout",function(){x(this).parent().toggle().siblings(".dt-truncate").toggle();return!1});this._initExportFormats();m.closest(".dt-wrapper").find(".dt-export").on("click"+p,this._exportFormat());m.on("click"+p,".dt-ajax-delete",this.ajaxAction(i18n.delete_confirmation));m.on("click"+p,".group-collapse, .group-expand", function(){var u=x(this),w=u.closest("tr.group"),z=!0;u.hasClass("group-collapse")&&(z=!1);r._toggleGroup(w,z)});if(this.tableConfig.bulkActions){if(this.tableConfig.bulkSingle)x(".bulk-select-options",m).hide();else m.on("click"+p,".bulk-select-all",this._bulkSelectAll());m.on("click"+p,".bulkcheckbox",this._bulkSelectRow())}return!0},_unbindEvents:function(){var m=x(this.element),p=this.eventNamespace;m.off(p);m.closest(".dt-wrapper").find(".dt-export").off(p);return!0}});x.fn.dataTable.Api.register("clearPipeline()",