From 72cce9b306f26f49e3d877622050168c60e5a6f6 Mon Sep 17 00:00:00 2001 From: Chris Mitchell Date: Tue, 5 Dec 2017 23:58:50 -0500 Subject: [PATCH 1/5] Remove unused code --- .../templates/wooey/scripts/script_view.html | 37 ------------------- 1 file changed, 37 deletions(-) diff --git a/wooey/templates/wooey/scripts/script_view.html b/wooey/templates/wooey/scripts/script_view.html index cafcbe4d..f1043102 100644 --- a/wooey/templates/wooey/scripts/script_view.html +++ b/wooey/templates/wooey/scripts/script_view.html @@ -204,49 +204,12 @@

{{ script.script_name }}

return $remove_input; }; - var loadWooeyScript = function(url, params, form){ - $.get(url, params, function(data){ - form.attr('action', data.action); - var $wooey_tabs = form.find('#wooey-script-tabs'); - var $wooey_content = form.find('#wooey-script-content'); - for(var i=0;i'+data.groups[i].group_name+''); - var new_panel = $('
'); - new_panel.html(data.groups[i].form); - $wooey_content.append(new_panel); - } - var $first = $('a[href="#wooey_dynamic_tab0"]'); - if($first.length) - $first.trigger('click'); - initializeWooeyScript(); - }, "json"); - }; - - var updateScriptInfo = function(url){ - // set the details of what script we clicked - $('.wooey-dynamic-tabs').remove(); - var $scriptBox = $("a[data-href='"+url+"']"); - var title = $scriptBox.find('.wooey-script-title').text(); - var desc = $scriptBox.find('.wooey-script-description').text(); - $('#wooey-script-description').text(desc); - var $title = $('#wooey-script-title'); - $title.text(title); - var currentTop = $(document).scrollTop(); - var scriptTop = $title.closest('.center-div').offset().top; - if (currentTop > scriptTop) - window.scrollTo(0, scriptTop); - }; - {% if job_info %} // Track file changes $("input:file").change(function (){ var fileName = $(this).val(); filesUploaded[$(this).attr('name')] = fileName; }); - var $jobform = $('#wooey-job-form'); - updateScriptInfo('{{ job_info.data_url }}'); - loadWooeyScript('{{ job_info.url }}', {job_id: '{{ job_info.job_id }}'}, $jobform); - $jobform.find('#wooey_clone_job_id').val("{{ job_info.job_id }}"); {% endif %} initializeWooeyScript(); From 123e7d975415abd85d5c580948a2d4ae194630ec Mon Sep 17 00:00:00 2001 From: Chris Mitchell Date: Tue, 5 Dec 2017 23:59:08 -0500 Subject: [PATCH 2/5] Fix type corercion --- wooey/templates/wooey/scripts/script_view.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wooey/templates/wooey/scripts/script_view.html b/wooey/templates/wooey/scripts/script_view.html index f1043102..0d83d1e9 100644 --- a/wooey/templates/wooey/scripts/script_view.html +++ b/wooey/templates/wooey/scripts/script_view.html @@ -134,7 +134,7 @@

{{ script.script_name }}

$(wooey_multiple_selector).parent().each( function(element, value){ var $wooey_multiples = $(value).find(wooey_multiple_selector); - if($wooey_multiples.length != 1) { + if($wooey_multiples.length !== 1) { for (var i = 0; i < $wooey_multiples.length; i++) { var $remove_button = removeMultiInput(); $remove_button.appendTo($wooey_multiples[i]); @@ -151,7 +151,7 @@

{{ script.script_name }}

var $containers = $this.siblings(wooey_multiple_selector); // check the choice limit, are we at it? var choice_limit = $this.data(wooey_choice_limit); - if(choice_limit && ($containers.length == choice_limit)){ + if(choice_limit && ($containers.length === choice_limit)){ // give a notice maxChoices($this); return; @@ -159,7 +159,7 @@

{{ script.script_name }}

var $container = $containers.first(); // if the container doesn't have a remove button since it's the first one, add one - if($container.find(wooey_remove_selector).length == 0){ + if($container.find(wooey_remove_selector).length === 0){ removeMultiInput().appendTo($container); } var $new_target = $container.clone(); From 280ff972a3e85a8078b8a7617fee42d39013c37c Mon Sep 17 00:00:00 2001 From: Chris Mitchell Date: Wed, 6 Dec 2017 00:03:08 -0500 Subject: [PATCH 3/5] Remove unused parameters in job_info context --- wooey/views/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wooey/views/views.py b/wooey/views/views.py index 2d2925bb..e64a53ea 100644 --- a/wooey/views/views.py +++ b/wooey/views/views.py @@ -72,7 +72,7 @@ def get_context_data(self, **kwargs): if job_id: job = WooeyJob.objects.get(pk=job_id) if job.user is None or (self.request.user.is_authenticated() and job.user == self.request.user): - context['job_info'] = {'job_id': job_id, 'url': job.get_resubmit_url(), 'data_url': job.script_version.script.get_url()} + context['job_info'] = {'job_id': job_id} for i in job.get_parameters(): value = i.value From 66d1b5186fd75bd1802c76b43b7b63348f3a7c46 Mon Sep 17 00:00:00 2001 From: Chris Mitchell Date: Wed, 6 Dec 2017 09:26:56 -0500 Subject: [PATCH 4/5] Install django prior to reqs.txt --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6d88d495..502efcde 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,8 +41,8 @@ init: install: - ps: (new-object net.webclient).DownloadFile('https://bootstrap.pypa.io/get-pip.py', 'C:/get-pip.py') - "%PYTHON%/python.exe C:/get-pip.py" + - "%PYTHON%/Scripts/pip.exe install %DJANGO%" - "%PYTHON%/Scripts/pip.exe install -r requirements.txt" - - "%PYTHON%/Scripts/pip.exe install --upgrade %DJANGO%" - "%PYTHON%/Scripts/pip.exe install -e ." # setup our path to include python scripts - cmd: SET PATH=%PATH%;%PYTHON%/Scripts From f4a81bf0748c67ca17b9669945135f919a257db8 Mon Sep 17 00:00:00 2001 From: Chris Mitchell Date: Wed, 6 Dec 2017 18:10:36 -0500 Subject: [PATCH 5/5] fix appveyor matrix --- appveyor.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 502efcde..004bcf92 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,10 +5,14 @@ environment: DJANGO: "Django==1.7.*" - PYTHON: "C:/Python27" DJANGO: "Django==1.8.*" - - # keep this to just maintain the latest version - PYTHON: "C:/Python27" - DJANGO: "Django" + DJANGO: "Django==1.9.*" + - PYTHON: "C:/Python27" + DJANGO: "Django==1.10.*" + + # The latest version of Django is no longer python2 compatible + #- PYTHON: "C:/Python27" + # DJANGO: "Django" - PYTHON: "C:/Python34" DJANGO: "Django==1.7.*"