Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
6f4a557
Modifying config files and parser
josenavas Feb 19, 2016
f65d6bf
Merge branch 'subdir-portals' of https://github.com/biocore/qiita int…
antgonza Feb 19, 2016
ff36f09
Addressing comments
josenavas Feb 19, 2016
17042b9
fixing some files!
antgonza Feb 19, 2016
f0271e8
Fixing parser
josenavas Feb 19, 2016
6bd9d31
Merge branch 'master' of https://github.com/biocore/qiita into subdir…
josenavas Feb 19, 2016
60c50e8
Merge branch 'subdir-portals' of https://github.com/biocore/qiita int…
antgonza Feb 19, 2016
a0ab325
update sitebase for portals
squirrelo Feb 19, 2016
23afbde
move to raw output
squirrelo Feb 19, 2016
b3fc0a1
addressing @squirrelo comments
antgonza Feb 19, 2016
e5bae74
update error_log
squirrelo Feb 19, 2016
71e8383
update list_studies
squirrelo Feb 19, 2016
de2b96b
fixing some files!
antgonza Feb 19, 2016
731d62c
Merge pull request #1649 from antgonza/subdir-portals-agp
josenavas Feb 19, 2016
65c1d8d
Merge pull request #1650 from squirrelo/portal-updates-1
josenavas Feb 19, 2016
d4e544a
Fixing form in error_log.html
josenavas Feb 19, 2016
9e28c90
Merge pull request #1651 from squirrelo/portal-updates-2
josenavas Feb 19, 2016
b7ea47e
Merge branch 'subdir-portals' of https://github.com/biocore/qiita int…
josenavas Feb 19, 2016
78bc774
Fixing various files
josenavas Feb 19, 2016
f4a1ce1
More files
josenavas Feb 19, 2016
9d0d57d
Fixing study description templates
josenavas Feb 19, 2016
31acb67
Merge pull request #1655 from josenavas/subdir-portals-misc
antgonza Feb 20, 2016
a10e4af
Fixing comments
josenavas Feb 20, 2016
427f866
Adding missing import
josenavas Feb 20, 2016
48094b8
Merge pull request #1656 from josenavas/subdir-portals-2
antgonza Feb 20, 2016
593dbee
Merge pull request #1654 from josenavas/portal-updates-2
antgonza Feb 20, 2016
4981f03
Merge pull request #1652 from antgonza/subdir-portals-agp-1
josenavas Feb 20, 2016
e02ec12
Merge pull request #1657 from josenavas/subdir-portals-study-desc-tem…
antgonza Feb 20, 2016
18fdd3a
Fixing merge conflict
josenavas Feb 23, 2016
a8f8271
Fixing link in list_studies
josenavas Feb 23, 2016
690106f
Adding setUp to TestSearchStudiesAJAX
josenavas Feb 23, 2016
afcd709
Adding a test to TestSearchStudiesAJAX with different portal
josenavas Feb 23, 2016
ff469b9
Changing url in email sent to the user
josenavas Feb 24, 2016
4689470
Fixing link in sitebase.html
josenavas Feb 24, 2016
bbe27ca
Fixing moi call in analysis
josenavas Feb 25, 2016
11372c8
Fixing login_url in webserver config
josenavas Feb 25, 2016
a55fb93
Merge branch 'subdir-portals-missing' of https://github.com/josenavas…
antgonza Feb 29, 2016
030f397
Merge pull request #1662 from josenavas/subdir-portals-missing
antgonza Feb 29, 2016
c23fcee
solving rest of issues
antgonza Mar 1, 2016
6c933fb
Merge pull request #1670 from antgonza/fixing-portals
josenavas Mar 1, 2016
8ab30b5
some more minor fixes
antgonza Mar 2, 2016
d1c5468
Merge pull request #1673 from antgonza/fixing-portals-1
josenavas Mar 2, 2016
b90cbd5
Solving merge conflicts
josenavas Apr 1, 2016
1d629a5
Merge pull request #1738 from josenavas/subdir-portals-asp
antgonza Apr 1, 2016
7df98ca
make share js more generic
squirrelo Apr 8, 2016
997274b
add anaysis sharing to UI. Fix #1615
squirrelo Apr 8, 2016
5fe04bc
add & update tests
squirrelo Apr 8, 2016
01ac908
add messaging for sharing analyses and studies
squirrelo Apr 8, 2016
1a3414a
merge origin/share-studies-in-studies
squirrelo Apr 8, 2016
9d7524b
remove global var
squirrelo Apr 8, 2016
63d0a7a
fix analysis share changes
squirrelo Apr 8, 2016
5fb1147
merge origin/share-studies-in-studies
squirrelo Apr 8, 2016
2314e24
fix backwards messages
squirrelo Apr 9, 2016
b40bb8b
merge upstream/master
squirrelo Apr 9, 2016
32f052b
fix suggestions
squirrelo Apr 10, 2016
3f60461
indentation
squirrelo Apr 11, 2016
5ad25f0
use data attribute
squirrelo Apr 11, 2016
521f8af
Solving merge conflicts
josenavas Apr 11, 2016
d4af309
here we go ...
antgonza Apr 11, 2016
a2978d6
addressing @josenavas comments
antgonza Apr 11, 2016
4aef864
Merge pull request #1763 from antgonza/subdir-portals-antoniog
josenavas Apr 11, 2016
4f268fd
fixed processing_artifact.html
Apr 11, 2016
288930e
FIX: urls
mortonjt Apr 11, 2016
b9726e9
update for portals
squirrelo Apr 11, 2016
fc91318
Merge pull request #1766 from mortonjt/urls2
josenavas Apr 11, 2016
5e954b8
fixed import in processing_artifact
Apr 11, 2016
8492ecb
Merge pull request #1768 from squirrelo/share-analyses
antgonza Apr 11, 2016
b797495
Merge pull request #1767 from squirrelo/portals-1
josenavas Apr 11, 2016
f4b1d40
Merge pull request #1765 from tkosciol/subdir-portals-tomasz
josenavas Apr 11, 2016
44bcbb5
ENH:Update URLs in data_type_menu and prep_summary
ElDeveloper Apr 11, 2016
3e9525b
Merge pull request #1769 from ElDeveloper/subdir-portals-yoshiki
josenavas Apr 11, 2016
8fdab75
Fixing study base
josenavas Apr 11, 2016
94dba47
missing
josenavas Apr 11, 2016
a01fe32
Merge pull request #1770 from josenavas/subdir-portals-base
antgonza Apr 11, 2016
e50a7f7
update sharing for portals
squirrelo Apr 11, 2016
3d47374
update sharing for portals
squirrelo Apr 11, 2016
a2dcb69
add missing init
squirrelo Apr 11, 2016
ec1aa7e
Fixing sample_summary.html
josenavas Apr 11, 2016
cd16e14
BUG: Move admin tasks to the main portal only
ElDeveloper Apr 11, 2016
a105310
add missing portals calls
squirrelo Apr 11, 2016
4030341
Merge pull request #1773 from ElDeveloper/admin-portals
josenavas Apr 11, 2016
bd0ea05
Merge pull request #1772 from josenavas/subdir-portals-3
antgonza Apr 11, 2016
8751685
Merge pull request #1771 from squirrelo/sharing-portals-changes
josenavas Apr 11, 2016
921a886
QUOTES
squirrelo Apr 11, 2016
ef44f38
Merge pull request #1774 from squirrelo/sharing-portals-changes
josenavas Apr 11, 2016
b629203
remove URL from sharing
squirrelo Apr 11, 2016
b52311a
Merge pull request #1775 from squirrelo/sharing-portals-changes
josenavas Apr 11, 2016
0e81d94
remove url
squirrelo Apr 11, 2016
291fb69
fix message
squirrelo Apr 11, 2016
3a68699
Merge pull request #1776 from squirrelo/sharing-portals-changes
antgonza Apr 11, 2016
9cae18f
change portal config
squirrelo Apr 11, 2016
1c64740
move import back
squirrelo Apr 11, 2016
6c9c666
Adding the portal to the base url for the plugins
josenavas Apr 11, 2016
be58c8d
Merge pull request #1777 from squirrelo/sharing-portals-changes
antgonza Apr 11, 2016
542ebdb
Adding comments
josenavas Apr 11, 2016
4f2450d
Merge pull request #1778 from josenavas/subdir-portals-plugin
antgonza Apr 11, 2016
38c56ae
Fixing config file
josenavas Apr 11, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions qiita_core/configuration_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ def _get_main(self, config):
self.max_upload_size = config.getint('main', 'MAX_UPLOAD_SIZE')
self.require_approval = config.getboolean('main', 'REQUIRE_APPROVAL')
self.portal = config.get('main', 'PORTAL')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both portal and portal_dir are missing from the docstring for the class.

self.portal_dir = config.get('main', 'PORTAL_DIR')
if not self.portal_dir:
self.portal_dir = ""
self.plugin_launcher = config.get('main', 'PLUGIN_LAUNCHER')

self.valid_upload_extension = [ve.strip() for ve in config.get(
Expand Down
3 changes: 3 additions & 0 deletions qiita_core/support_files/config_test.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ VALID_UPLOAD_EXTENSION = fastq,fastq.gz,txt,tsv,sff,fna,qual
# Portal the site is working under
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since these have to do with portals, shouldn't these be under the portal section of the config file?

PORTAL = QIITA

# Portal subdirectory
PORTAL_DIR =

# Script used for launching plugins
PLUGIN_LAUNCHER = qiita-plugin-launcher

Expand Down
Binary file modified qiita_core/support_files/config_test_travis.cfg.enc
Binary file not shown.