upload json file #68
Merged
upload json file #68
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rizalfr
force-pushed
the
rizalfr/f_upload_json
branch
from
865a611 to
cf5edfb
Compare
Amadeea
requested changes
Jun 6, 2018
There was a problem hiding this comment.
UI:
Add title for 'Main's Configuration'
'Upload JSON' title should be change with 'Team's Configuration'
BUG:
upload_file function called twice which one belongs to upload py and another belongs to upload json. need to differentiate the forms' names between upload py and upload json
rizalfr
force-pushed
the
rizalfr/f_upload_json
branch
from
cf5edfb to
0049c7b
Compare
Amadeea
requested changes
Jun 6, 2018
locust/static/locust.js
Outdated
| var form = $('#upload_file_form')[0]; | ||
| var form_data = new FormData(form); | ||
| var form_data = new FormData($('.upload_file_form_test_file')[0]); | ||
| $.ajax({ |
There was a problem hiding this comment.
how about put this ajax to a function? and the function receive form data parameter. for example
function call_upload_file(form_data){$.ajax({...})}
and inside submit handler all you need to do is call that function with passing form data parameter
rizalfr
force-pushed
the
rizalfr/f_upload_json
branch
from
975746c to
23ae944
Compare
Amadeea
approved these changes
Jun 6, 2018
pancaprima
approved these changes
Jul 17, 2018
pancaprima
pushed a commit
that referenced
this pull request
Aug 21, 2018
* enabling json uploading * fix modal ui in upload json * enabling upload on json also * modify ui a bit and avoid duplicated message * unify the function
pancaprima
added a commit
that referenced
this pull request
Aug 21, 2018
* Prima Update locust base version to 0.8.1 (#70) * find locustfile in the root directory * Add ability to write out csv file data as part of command line run * Update minimum version of gevent to fix locustio#598 * CSV flag, review comments * Modify gevent wsgi and libev dependencies * Sort all python imports * Sort setup.py imports * Standardize utf8 file coding declarations * Bump version to 0.8a3 for another pre-release candidate * Changed from deprecated method name * Added test_suite argument to setup.py’s setup() method call Not specifying the test_suite argument (using the default one) resulted in all tests being run multiple times (on Python 3.5). I haven’t looked in to why, since specifying “locust.test” should be correct, and fixes it. * Suppress a warning that appears when running the tests on Python 3, that can cause tests (that depends on output to stderr) to fail. * Apply gevent monkey patching before we import requests, to avoid infinite recursion error when doing SSL requests. Should fix locustio#655. * Also patch threading when applying gevent monkey patch. Should fix locustio#569. * Bumped version to 0.8a4 * Improved changelog * Update main.py Code comment and slightly more descriptive variable name * More info about 0.8 to the Changelog * Added some random examples that maybe could be useful to someone * Bumped version to 0.8 * Upgrade pyzmq to latest stable version, and changed so that we do not pin the version (will make it easier to install Locust on Windows) * Better installation instructions for Windows * Bumped version to 0.8.1 * Erlangga Add team_configuration property (#72) * add get team configuration * change read json path * Rizal upload json file for team configuration (#68) * enabling json uploading * fix modal ui in upload json * enabling upload on json also * modify ui a bit and avoid duplicated message * unify the function * bug fix team configuration function (#88) * change team_configuration function * update configuration works
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.