Skip to content

WIP: Portals subdirectory #1648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 97 commits into from
Apr 12, 2016
Merged

WIP: Portals subdirectory #1648

merged 97 commits into from
Apr 12, 2016

Conversation

@josenavas
Copy link
Contributor

This branch holds the WIP to change the portals to work on subdirectories rather than in subdomain.

Remaining things to check:

  • Uploader - when you upload files, it is trying to do it against the main site, rather than test
  • Analysis - in the analysis pipeline, when moi creates the job group, something is acting up as it only creates the first job in the analysis (the creation one). All the links in moi look correct so I'm unsure where the source of the issue is in here.
  • Once the study is created, the link that shows with "study BLA created" is linking to the main site rather than the portal.

squirrelo
squirrelo reviewed Feb 19, 2016
View reviewed changes
qiita_core/configuration_manager.py Outdated
self.working_dir)
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.

@squirrelo
Copy link
Contributor

👍 for the config file updates

@antgonza
Copy link
Member

👍

antgonza and others added 17 commits February 19, 2016 12:27
@antgonza
addressing @squirrelo comments
b3fc0a1
@squirrelo
update error_log
e5bae74
@squirrelo
update list_studies
71e8383
@antgonza
fixing some files!
de2b96b
@josenavas
Merge pull request #1649 from antgonza/subdir-portals-agp
731d62c 
Subdir portals agp
@josenavas
Merge pull request #1650 from squirrelo/portal-updates-1
65c1d8d 
Update sitebase for portals
@josenavas
Fixing form in error_log.html
d4e544a
@josenavas
Merge pull request #1651 from squirrelo/portal-updates-2
9e28c90 
Portal updates - error_log & list_studies
@josenavas
Merge branch 'subdir-portals' of https://github.com/biocore/qiita int…
b7ea47e 
…o portal-updates-2
@josenavas
Fixing various files
78bc774
@josenavas
More files
f4a1ce1
@josenavas
Fixing study description templates
9d0d57d
@antgonza
Merge pull request #1655 from josenavas/subdir-portals-misc
31acb67 
Fixing various files
@josenavas
Fixing comments
a10e4af
@josenavas
Adding missing import
427f866
@antgonza
Merge pull request #1656 from josenavas/subdir-portals-2
48094b8 
Fixing some more templates
@antgonza
Merge pull request #1654 from josenavas/portal-updates-2
593dbee 
Portal updates - error_log & list_studies (missing 1!)
ElDeveloper and others added 18 commits April 11, 2016 13:20
@ElDeveloper
BUG: Move admin tasks to the main portal only
cd16e14
@squirrelo
add missing portals calls
a105310
@josenavas
Merge pull request #1773 from ElDeveloper/admin-portals
4030341 
BUG: Move admin tasks to the main portal only
@antgonza
Merge pull request #1772 from josenavas/subdir-portals-3
bd0ea05 
Fixing sample_summary.html
@josenavas
Merge pull request #1771 from squirrelo/sharing-portals-changes
8751685 
Sharing - portals changes
@squirrelo
QUOTES
921a886
@josenavas
Merge pull request #1774 from squirrelo/sharing-portals-changes
ef44f38 
QUOTES
@squirrelo
remove URL from sharing
b629203
@josenavas
Merge pull request #1775 from squirrelo/sharing-portals-changes
b52311a 
remove URL from sharing
@squirrelo
remove url
0e81d94
@squirrelo
fix message
291fb69
@antgonza
Merge pull request #1776 from squirrelo/sharing-portals-changes
3a68699 
Fix redundant URLs
@squirrelo
change portal config
9cae18f
@squirrelo
move import back
1c64740
@josenavas
Adding the portal to the base url for the plugins
6c9c666
@antgonza
Merge pull request #1777 from squirrelo/sharing-portals-changes
be58c8d 
Sharing portals changes
@josenavas
Adding comments
542ebdb
@antgonza
Merge pull request #1778 from josenavas/subdir-portals-plugin
4f2450d 
Adding the portal to the base url for the plugins
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.008%) to 82.717% when pulling 4f2450d on subdir-portals into 9877526 on master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 82.756% when pulling 38c56ae on subdir-portals into 9877526 on master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 82.756% when pulling 38c56ae on subdir-portals into 9877526 on master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 82.756% when pulling 38c56ae on subdir-portals into 9877526 on master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 82.756% when pulling 38c56ae on subdir-portals into 9877526 on master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 82.756% when pulling 38c56ae on subdir-portals into 9877526 on master.

@antgonza antgonza closed this Apr 12, 2016
@antgonza antgonza reopened this Apr 12, 2016
@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 82.756% when pulling 38c56ae on subdir-portals into 9877526 on master.

@antgonza antgonza merged commit c06bc90 into master Apr 12, 2016
@antgonza antgonza deleted the subdir-portals branch May 11, 2016 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@josenavas @squirrelo @antgonza @coveralls @mortonjt @ElDeveloper