Error: No form selected.
' - } else + } else { var msg = 'Could not open the form. See browser console log for a detailed error message.
'; } @@ -52,7 +52,7 @@ var dataNS = odkmaker.namespace.load('odkmaker.data'); odkmaker.application.newForm(); else odkmaker.application.confirm('Are you sure? You will lose unsaved changes to the current form.', odkmaker.application.newForm); - + }); $('.menu .saveLink').click(function(event) { @@ -270,6 +270,7 @@ var dataNS = odkmaker.namespace.load('odkmaker.data'); $form.submit(); }); + /* #322 remove aggregate */ $('.aggregateDialog .aggregateExportButton').click(function(event) { event.preventDefault(); diff --git a/public/javascripts/modals.js b/public/javascripts/modals.js index 655ed60..4291894 100644 --- a/public/javascripts/modals.js +++ b/public/javascripts/modals.js @@ -72,6 +72,7 @@ var modalsNS = odkmaker.namespace.load('odkmaker.modals'); }, aggregateDialog: function($dialog) { + /* #322 remove aggregate */ $dialog.removeClass('exporting'); }, formPropertiesDialog: function($dialog) diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css index df4353c..e4cb4a3 100644 --- a/public/stylesheets/styles.css +++ b/public/stylesheets/styles.css @@ -1438,6 +1438,7 @@ body > .control.last .controlFlowArrow, float: right; } +/* #322 remove aggregate */ .aggregateDialog .aggregateInstanceName { width: calc(100% - 7.6em); @@ -1475,7 +1476,7 @@ body > .control.last .controlFlowArrow, padding-left: 15em; } -.hidden +.hidden { display: none; } diff --git a/server/odkbuild_server.rb b/server/odkbuild_server.rb index d1a2554..f2f7b5e 100644 --- a/server/odkbuild_server.rb +++ b/server/odkbuild_server.rb @@ -231,8 +231,8 @@ class OdkBuild < Sinatra::Application # bounce a payload through to a local build2xlsform instance for dev env. in prod, this ought # to be done at the apache/nginx/etc level via proxypass. - # The host and port for the build2xlsform service are parameterised to allow - # both a source install (localhost:8686) and docker-compose install (build2xls:8686). + # The host and port for the build2xlsform service are parameterised to allow + # both a source install (localhost:8686) and docker compose install (build2xls:8686). post '/convert' do srv = ENV['B2X_HOST'] || 'localhost' prt = ENV['B2X_PORT'] || '8686' @@ -247,6 +247,7 @@ class OdkBuild < Sinatra::Application return res.body end + # #322 remove aggregate # bounce a payload through the server to aggregate post '/aggregate/post' do # make sure we're good to go diff --git a/server/views/index.erb b/server/views/index.erb index 08b583c..0bce9bf 100644 --- a/server/views/index.erb +++ b/server/views/index.erb @@ -67,7 +67,11 @@