Charts: Update query limits

client/galaxy/scripts/mvc/tools/tools-template.js

@@ -11,10 +11,6 @@ return {
                 '</div>';
     },
     
-    citations: function() {
-        return  '<div id="citations"></div>';
-    },
-    
     success: function(response) {
         // check
         if (!response.jobs || !response.jobs.length) {

config/plugins/visualizations/charts/static/charts/forms/default.js

@@ -6,7 +6,6 @@ return {
     library     : '',
     tag         : '',
     keywords    : '',
-    query_limit : 0,
     settings    : {
         separator_x  : {
             title       : 'X axis',

config/plugins/visualizations/charts/static/charts/jqplot/common/config.js

@@ -7,7 +7,6 @@ return $.extend(true, {}, config_default, {
     tag         : 'div',
     zoomable    : true,
     keywords    : 'medium',
-    query_limit : 10000,
     settings    : {
         separator_grid  : {
             title       : 'Grids',

config/plugins/visualizations/charts/static/charts/nvd3/common/config.js

@@ -4,8 +4,7 @@ return $.extend(true, {}, config_default, {
     category    : '',
     library     : 'NVD3',
     tag         : 'svg',
-    keywords    : 'small',
-    query_limit : 500
+    keywords    : 'small'
 });
 
 });

config/plugins/visualizations/charts/static/charts/nvd3/histogram_discrete/config.js

@@ -5,7 +5,6 @@ return $.extend(true, {}, nvd3_config, {
     category    : 'Data processing (requires \'charts\' tool from Toolshed)',
     execute     : 'histogramdiscrete',
     keywords    : 'small medium large',
-    query_limit : 10000,
     columns     : {
         x : {
             title       : 'Observations',

config/plugins/visualizations/charts/static/charts/others/heatmap/config.js

@@ -3,7 +3,6 @@ define(['plugin/charts/forms/default'], function(config_default) {
 return $.extend(true, {}, config_default, {
     title       : 'Heatmap',
     category    : 'Others',
-    query_limit : 1000,
     library     : 'Custom',
     tag         : 'svg',
     keywords    : 'small',

config/plugins/visualizations/charts/static/library/datasets.js

@@ -38,7 +38,6 @@ return Backbone.Collection.extend(
         
         // query block size
         var query_size    = this.app.config.get('query_limit');
-        var query_timeout = this.app.config.get('query_timeout');
         
         // set range
         var query_start = request_dictionary.start || 0;

config/plugins/visualizations/charts/static/models/config.js

@@ -5,7 +5,7 @@ define([], function() {
 return Backbone.Model.extend({
     // options
     defaults : {
-        query_limit     : 5000,
+        query_limit     : 10000,
         query_timeout   : 100
     }
 });

static/scripts/mvc/tools/tools-template.js

@@ -11,10 +11,6 @@ return {
                 '</div>';
     },
     
-    citations: function() {
-        return  '<div id="citations"></div>';
-    },
-    
     success: function(response) {
         // check
         if (!response.jobs || !response.jobs.length) {

static/scripts/packed/mvc/tools/tools-template.js

@@ -1 +1 @@
-define([],function(){return{help:function(a){return'<div class="toolHelp"><div class="toolHelpBody">'+a+"</div></div>"},citations:function(){return'<div id="citations"></div>'},success:function(c){if(!c.jobs||!c.jobs.length){console.debug("tools-template::success() - Failed jobs.");return}var a=c.jobs.length;var d="";if(a==1){d="1 job has"}else{d=a+" jobs have"}var b='<div class="donemessagelarge"><p>'+d+" been successfully added to the queue - resulting in the following datasets:</p>";for(var e in c.outputs){b+='<p style="padding: 10px 20px;"><b>'+(parseInt(e)+1)+": "+c.outputs[e].name+"</b></p>"}b+="<p>You can check the status of queued jobs and view the resulting data by refreshing the History pane. When the job has been run the status will change from 'running' to 'finished' if completed successfully or 'error' if problems were encountered.</p></div>";return b},error:function(a){return'<div><p>The server could not complete the request. Please contact the Galaxy Team if this error persists.</p><textarea class="ui-textarea" disabled style="color: black;" rows="6">'+JSON.stringify(a,undefined,4)+"</textarea></div>"},batchMode:function(){return'<div class="ui-table-form-info"><i class="fa fa-sitemap" style="font-size: 1.2em; padding: 2px 5px;"/>This is a batch mode input field. A separate job will be triggered for each dataset.';"</div>"}}});
+define([],function(){return{help:function(a){return'<div class="toolHelp"><div class="toolHelpBody">'+a+"</div></div>"},success:function(c){if(!c.jobs||!c.jobs.length){console.debug("tools-template::success() - Failed jobs.");return}var a=c.jobs.length;var d="";if(a==1){d="1 job has"}else{d=a+" jobs have"}var b='<div class="donemessagelarge"><p>'+d+" been successfully added to the queue - resulting in the following datasets:</p>";for(var e in c.outputs){b+='<p style="padding: 10px 20px;"><b>'+(parseInt(e)+1)+": "+c.outputs[e].name+"</b></p>"}b+="<p>You can check the status of queued jobs and view the resulting data by refreshing the History pane. When the job has been run the status will change from 'running' to 'finished' if completed successfully or 'error' if problems were encountered.</p></div>";return b},error:function(a){return'<div><p>The server could not complete the request. Please contact the Galaxy Team if this error persists.</p><textarea class="ui-textarea" disabled style="color: black;" rows="6">'+JSON.stringify(a,undefined,4)+"</textarea></div>"},batchMode:function(){return'<div class="ui-table-form-info"><i class="fa fa-sitemap" style="font-size: 1.2em; padding: 2px 5px;"/>This is a batch mode input field. A separate job will be triggered for each dataset.';"</div>"}}});