Skip to content

Commit

Permalink
waffle prereg challenge views to prevent new entries from being made.
Browse files Browse the repository at this point in the history
  • Loading branch information
Johnetordoff committed Dec 3, 2018
1 parent d854276 commit c0514ba
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 5 deletions.
2 changes: 1 addition & 1 deletion website/prereg/utils.py
@@ -1,5 +1,5 @@
from website.registries.utils import get_campaign_schema


def get_prereg_schema(campaign='prereg'):
def get_prereg_schema(campaign='prereg_challenge'):
return get_campaign_schema(campaign)
9 changes: 7 additions & 2 deletions website/prereg/views.py
Expand Up @@ -9,8 +9,13 @@
* website/static/css/prereg.css
"""

import waffle

from website.registries import views
from osf import features

def prereg_landing_page(**kwargs):
"""Landing page for the prereg challenge"""
return views._view_registries_landing_page('prereg', **kwargs)
"""Landing page for osf prereg"""
if waffle.switch_is_active(features.OSF_PREREGISTRATION):
return views._view_registries_landing_page('prereg', **kwargs)
return views._view_registries_landing_page('prereg_challenge', **kwargs)
5 changes: 5 additions & 0 deletions website/project/views/drafts.py
Expand Up @@ -21,6 +21,8 @@
from osf.utils.functional import rapply
from osf.models import NodeLog, RegistrationSchema, DraftRegistration, Sanction

import waffle

from website.exceptions import NodeStateError
from website.project.decorators import (
must_be_valid_project,
Expand Down Expand Up @@ -121,6 +123,9 @@ def submit_draft_for_review(auth, node, draft, *args, **kwargs):
:rtype: dict
:raises: HTTPError if embargo end date is invalid
"""
if waffle.switch_is_active(features.OSF_PREREGISTRATION):
raise DeprecationWarning('The Prereg Challenge is over this endpoint is deprecated.')

data = request.get_json()
meta = {}
registration_choice = data.get('registrationChoice', 'immediate')
Expand Down
3 changes: 2 additions & 1 deletion website/registries/utils.py
@@ -1,5 +1,6 @@
REG_CAMPAIGNS = {
'prereg': 'Prereg Challenge',
'prereg_challenge': 'Prereg Challenge',
'prereg': 'OSF Preregistration',
'registered_report': 'Registered Report Protocol Preregistration',
}

Expand Down
11 changes: 10 additions & 1 deletion website/templates/project/register_draft.mako
Expand Up @@ -25,14 +25,23 @@
<div class="row-md-12 scripted">
<span data-bind="ifnot: draft.isPendingApproval">
<a type="button" class="btn btn-default pull-left" href="${draft['urls']['edit']}">Continue editing</a>

%if waffle.switch_is_active(features.OSF_PREREGISTRATION):
<button type="button" class="btn btn-success pull-right"
data-toggle="tooltip" data-placement="top" title="The Prereg Challenge has expired"
style="margin-left: 5px;
box-shadow: none;
opacity: .65;">
Submit for review
</button>
%else:
<button id="register-submit" type="button" class="btn btn-success pull-right"
style="margin-left: 5px;"
data-bind="visible: draft.requiresApproval,
click: draft.submitForReview.bind(draft),
enable: editor.canSubmit">
Submit for review
</button>
%endif
</span>
<span data-bind="if: draft.isPendingApproval">
<a type="button" class="btn btn-default pull-left" href="${web_url_for('node_registrations', pid=node['id'], tab='drafts', _guid=True)}"> Back </a>
Expand Down

0 comments on commit c0514ba

Please sign in to comment.