Dan Funk
d1606ffb1a
forgot to include the new empty master workflow, which allows the tests to all pass.
2020-05-22 15:31:38 -04:00
Dan Funk
503c1c8f18
Allow disabling the Protocol Builder
...
PB_ENABLED can be set to false in the configuration (either in a file called instance/config.py, or as an environment variable)
Added a check in the base_test, to assure that we are always running tests with the test configuration, and bail out otherwise. Setting TESTING=true as an environment variable will get this, but so well the correct ordering of imports. Just be dead certain the first file every test file imports is base_test.py.
Aaron was right, and we call the Protocol Builder in all kinds of awful places. But we don't do this now. So Carlos, you should have the ability to reuse a lot of the logic in the study_service now.
I dropped the poorly named "study-update" endpoint completely. We weren't using it. POST and PUT to Study still work just fine for doing exactly that.
All the tests now run and pass with the Protocol builder disabled. Tests that specifically check PB behavior turn it back on for the test, or mock it out.
2020-05-22 14:37:49 -04:00
Dan Funk
b490005af7
dropping the remaining config stuff for flask_sso.
...
updaing the user 'sso' endpoint to provide additional information for debugging.
Pulling information from ldap to stay super consistent on where we get our information.
2020-05-22 09:50:18 -04:00
Dan Funk
1cc9a60bfe
clearing out the remaining references to the flask_sso library.
2020-05-22 08:01:33 -04:00
Dan Funk
4627318818
Dropping flask_sso library in favor of reading from the headers directly. Updating login to read from ldap once it has the user_id. Adding more information to the sso endpoint.
2020-05-22 07:55:58 -04:00
Dan Funk
b3ae9ee770
changing the mapping, because 'Uid' not 'uid'
2020-05-21 16:28:34 -04:00
Dan Funk
0265db7146
adding an /sso endpoint for testing.
2020-05-21 16:02:45 -04:00
Dan Funk
4628834106
just a few more logging details.
2020-05-21 12:11:35 -04:00
Aaron Louie
d76c18d329
Installs curl
2020-05-20 20:13:09 -04:00
Aaron Louie
d0f380e224
Uses Python 3.6.9
2020-05-20 16:49:55 -04:00
Aaron Louie
595364b415
Merge branch 'ec2/dev' into dev
2020-05-20 16:34:53 -04:00
Aaron Louie
b915794000
Fixes more paths.
2020-05-20 15:57:54 -04:00
Dan Funk
de7cebbd7d
o
2020-05-20 15:32:40 -04:00
Aaron Louie
616a47bd10
Fixes file paths
2020-05-20 15:17:03 -04:00
Dan Funk
5f793db606
It is critical that the Pipfile python version matches the python version on the server.
2020-05-20 15:07:16 -04:00
Aaron Louie
865188795f
Adds git. Purges apt cache after
2020-05-20 15:04:41 -04:00
Aaron Louie
97130e504a
Adds git
2020-05-20 14:57:03 -04:00
Aaron Louie
91a228d3f4
Trying to slim down the size of the image
2020-05-20 14:33:39 -04:00
Dan Funk
2c407ae607
adding requirements.txt and a way to regenerate it.
2020-05-20 14:21:39 -04:00
Dan Funk
57615edde3
adding wsgi configuration.
2020-05-20 14:01:09 -04:00
Dan Funk
8647ebee42
Moving spiff back to master branch, with fixes for parallel, and performance improvements.
2020-05-20 10:57:20 -04:00
Aaron Louie
51ece390f3
Merge branch 'testing' into dev
2020-05-20 10:03:41 -04:00
Aaron Louie
3808786f11
Merge branch 'rrt/dev' into dev
2020-05-20 10:02:44 -04:00
Aaron Louie
48f9873548
Adding yet another flush, because Travis builds keep failing due to database race condition issues in this method.
2020-05-20 10:02:30 -04:00
Aaron Louie
6f60b04b98
Merge pull request #68 from sartography/dev
...
Dev
2020-05-20 08:45:16 -04:00
Aaron Louie
e454993f6e
Merge branch 'testing' into dev
2020-05-20 00:14:51 -04:00
Aaron Louie
9fd3e8f1a5
Merge pull request #67 from sartography/rrt/dev
...
Rrt/dev
2020-05-20 00:14:21 -04:00
Aaron Louie
fc63d26322
Merge pull request #66 from sartography/feature/docx_images
...
Feature/docx images
2020-05-20 00:13:50 -04:00
Aaron Louie
58189285ad
Cleans up
2020-05-20 00:12:48 -04:00
Aaron Louie
2b5687c3a3
Fixes pernicious bug where template document versions were not being updated properly, and template completion script was not honoring version numbers
2020-05-20 00:10:32 -04:00
Aaron Louie
481a9ed04c
Gets image ids from task data and Injects images into jinja docx
2020-05-19 21:51:54 -04:00
Dan Funk
2f86a25032
Merge pull request #65 from sartography/feature/ldap_lookup
...
Quick cleanup, adding a space
2020-05-19 16:24:40 -04:00
Dan Funk
c4f2bd8dc6
Quick cleanup, adding a space
2020-05-19 16:23:20 -04:00
Dan Funk
66a3304541
Merge pull request #63 from sartography/feature/ldap_lookup
...
ldap lookup.
2020-05-19 16:22:02 -04:00
Dan Funk
951710d762
ldap lookup.
...
Refactored calls into a new lookup_service to keep things tidy.
New keys for all enum/auto-complete fields:
PROP_OPTIONS_FILE = "spreadsheet.name"
PROP_OPTIONS_VALUE_COLUMN = "spreadsheet.value.column"
PROP_OPTIONS_LABEL_COL = "spreadsheet.label.column"
PROP_LDAP_LOOKUP = "ldap.lookup"
FIELD_TYPE_AUTO_COMPLETE = "autocomplete"
2020-05-19 16:11:43 -04:00
Aaron Louie
1944dbc9c4
Merge pull request #60 from sartography/dev
...
Dev
2020-05-18 21:20:28 -04:00
Aaron Louie
20ce052e7b
Merge branch 'testing' into dev
2020-05-18 21:03:22 -04:00
Aaron Louie
a35229c954
Merge branch 'rrt/dev' into dev
2020-05-18 21:02:02 -04:00
Dan Funk
dff92c6e4c
fixing a test.
2020-05-18 20:49:50 -04:00
Dan Funk
30bd6bef08
Another nav fix from spiff.
2020-05-18 18:27:30 -04:00
Dan Funk
ecaac76fa5
More nav fixes via spiffworkflow.
2020-05-18 15:44:28 -04:00
Aaron Louie
26a8b633d1
Merge pull request #59 from sartography/dev
...
Dev
2020-05-18 13:20:47 -04:00
Aaron Louie
16b96eade5
Merge branch 'rrt/dev' into dev
2020-05-18 13:10:31 -04:00
Dan Funk
5c5c2a7312
Assure that new lines entered in text-fields are correctly added to the final word document.
2020-05-18 11:55:10 -04:00
Dan Funk
5f2331f081
Bumping w/ fixes in spiffworkflow for reset token.
2020-05-18 06:56:29 -04:00
Dan Funk
7ce460fffc
using a branch of spiffworkflow that fixes a deep recursion issue - this isn't perfect, but it's miles better than it was.
2020-05-17 17:06:00 -04:00
Dan Funk
fc080ce7a8
Don't reset the token to something that already has a token. Terrible things happen and we hit a recursion.
2020-05-17 13:29:36 -04:00
Dan Funk
d62c173494
Updating with new changes to the spiffworkflow navigation.
2020-05-17 11:57:04 -04:00
Dan Funk
f3c3d3c44e
Merge pull request #58 from sartography/testing
...
Testing
2020-05-16 16:08:23 -04:00
Dan Funk
ed7b427af4
Merge pull request #57 from sartography/feature/navigation
...
Feature/navigation
2020-05-16 16:01:43 -04:00
