aboutsummaryrefslogtreecommitdiff
path: root/wqflask/utility
AgeCommit message (Collapse)Author
2020-07-29Fixed error that occured for new resources in check_adminzsloan
* wqflask/utility/authentication_tools.py: the code forgot to get resource_info when a resource wasn't in Redis yet, causing an error when it was referenced, so I added a line getting the resource info (and also a couple comments for other lines related to authentication)
2020-07-25The variable is never defined, so let's default to "none"Pjotr Prins
2020-07-24Merge pull request #409 from BonfaceKilz/Build/add-testszsloan
Build/add tests
2020-07-24Revert "Add work-around for failed imports in unittest"BonfaceKilz
This reverts commit d5e87fa6fe7546b46790f512d984a5501223082f.
2020-07-24Add work-around for failed imports in unittestBonfaceKilz
* wqflask/utility/tools.py: Unittests will use `from wqflask.wqflask import app` and the gn2 script will use `from wqflask import app`
2020-07-24Apply autopep-8BonfaceKilz
* wqflask/utility/formatting.py: apply it
2020-07-24Add zero to num_repr dictionaryBonfaceKilz
* wqflask/utility/formatting.py(numify): Update `num_repr` to have a zero
2020-07-24Remove redundant variableBonfaceKilz
* wqflask/utility/corr_result_helpers.py(normalize_values_with_values): Remove `num_overlap`
2020-07-24Remove unused assertBonfaceKilz
* wqflask/utility/corr_result_helpers.py(normalize_values): At no one point will that assert be hit
2020-07-24Remove unused doc-testsBonfaceKilz
* wqflask/utility/corr_result_helpers.py: Delete doc-test
2020-07-24Simplify normalize_valuesBonfaceKilz
* wqflask/utility/corr_result_helpers.py(normalize_values): Replace loop with zip form
2020-07-24Remove unused doc-testsBonfaceKilz
* wqflask/utility/chunks.py: Remove test code from module
2020-07-24Revert "Add work-around for failed imports in unittest"BonfaceKilz
This reverts commit d5e87fa6fe7546b46790f512d984a5501223082f.
2020-07-24Add work-around for failed imports in unittestBonfaceKilz
* wqflask/utility/tools.py: Unittests will use `from wqflask.wqflask import app` and the gn2 script will use `from wqflask import app`
2020-07-22It should add new resources to Redis automatically nowzsloan
2020-07-16Expose elastic-search variables for tests to passBonfaceKilz
2020-07-08Removed remaining unused references to the old qtlreaperzsloan
2020-07-06Fixed some of the logic with how traits are authenticated to avoid situation ↵zsloan
where a trait is authenticated twice
2020-06-24Temporary partial fix to issue of resources without info; need to add ↵zsloan
something that automatically inserts resources with default privileges
2020-06-20Fixed ports for proxy (though I need to add the port to global variables) ↵zsloan
and also simplified the check_owner_or_admin function a little
2020-06-20Added some admin functionality and fixed issue with temp traitszsloan
2020-06-17A user's id is now set as a parameter if it doesn't already existauthentication_testzsloan
2020-06-17Adding all the authentication stuffzsloan
2020-06-05Commiting other current group/resource management code, plus the new fileszsloan
2020-06-04Really should have split this into many more commits:zsloan
- Now use proxy to pull trait data and hide traits/results that the user doesn't have view permission for - Created a factory method for creating trait ob so it can return None when user doesn't have view permissions (this is why such a large number of files are changed) - Added metadata to permutation export - Added current group management code - Added fixed password verification e-mail code
2020-05-28Added lines calling proxy for publish datasets + added some resource redis ↵zsloan
queries and a missing import for the hmac functions
2020-05-12Merging Danny's changes and Bonface's changes to js importszsloan
2020-05-12Added change for F2s in r/qtl and fixed minor issue in save_user in redis_toolszsloan
2020-05-07Committing current progress on group manager + a minor fix in dataset.pyzsloan
2020-05-06Commiting a few minor changes plus returning rqtl_mapping.py to the same as ↵zsloan
on testing branch before merging Danny's changes and testing them
2020-05-06Replace CSS dependencies for datatablesBonfaceKilz
2020-04-26Merge master and testingmasterPjotr Prins
2020-04-24Replaced hard-coded instances of GN2 urls with ones pulled from settings filezsloan
2020-04-22Fixed a variety of issues related to users registering and logging inzsloan
GN2 should now work when Redis is empty
2020-04-16Many changes, including:zsloan
- Added permutation strata option for R/qtl - Made a variety of aesthetic changes to collections-related pages - Made a variety of aesthetic changes to the multi-trait tool options on the search result and correlation pages - Made some functional changes to collections that prevent duplicate traits and ensure new traits are at the top - The "Default Collection" is now always at the bottom of the collection list and renamed to "Your Default Collection"
2020-04-03Added option to select cofactors from collection for R/qtlzsloan
Fixed some issues with displaying the R/qtl results from the RData HET3-ITP dataa
2020-03-27Added integration for using RData files with R/qtl, plus some other changes ↵zsloan
to how it decides which mapping methods to display on the trait page
2020-03-10Fixed issue that caused some problems when verifying hmaczsloan
2020-03-09I think this should complete consolidating all the collections code.zsloan
2020-03-03Missed one more reference in helper_functionszsloan
2020-03-03was missing a couple files in last commitzsloan
2020-03-03Refactored all the anonymous (not logged-in) user stuff so that both ↵zsloan
logged-in and anonymous users share the same code
2020-02-12Fixed issue that broke some logins with the new redis user codezsloan
2020-01-23Forgot to commit new file containing Redis functionszsloan
2019-10-18Fixed issue with collections orderingzsloan
2019-10-08Fixed serious issue that caused output to be wrong for new reaper mappingzsloan
Haplotype analyst now works for GEMMA Increased margin a bit to fix minor issue with buttons getting cut off on certain Safari versions for bar chart
2019-09-24Fixed issue that caused GEMMA to not work with genotype files without cM, ↵zsloan
though this issue still needs to be dealt with to get the new qtlreaper working
2019-09-06Fix name of javascript-twitter-post-fetcherPjotr Prins
2019-07-23Added change to automatically update datasets list using rest api instead of ↵zsloan
json file Removed option to edit certain html pages, like news, policies, etc
2019-06-07Global search and correlation results can handle null expression nowzsloan