Skip to content

Commit

Permalink
Merge pull request GoogleChrome#596 from jstenback/entry-edit-multili…
Browse files Browse the repository at this point in the history
…ne-etc-fixes

Fix editing of entries with multiline values
  • Loading branch information
jpmedley authored Feb 28, 2019
2 parents edc0a2e + 5cd94d1 commit 79a646b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
24 changes: 12 additions & 12 deletions models.py
Original file line number Diff line number Diff line change
Expand Up @@ -845,15 +845,15 @@ def put(self, **kwargs):

owner = db.ListProperty(db.Email)
footprint = db.IntegerProperty()
interop_compat_risks = db.StringProperty()
ergonomics_risks = db.StringProperty()
activation_risks = db.StringProperty()
security_risks = db.StringProperty()
debuggability = db.StringProperty()
interop_compat_risks = db.StringProperty(multiline=True)
ergonomics_risks = db.StringProperty(multiline=True)
activation_risks = db.StringProperty(multiline=True)
security_risks = db.StringProperty(multiline=True)
debuggability = db.StringProperty(multiline=True)
all_platforms = db.BooleanProperty()
all_platforms_descr = db.StringProperty()
wpt = db.BooleanProperty()
wpt_descr = db.StringProperty()
wpt_descr = db.StringProperty(multiline=True)

visibility = db.IntegerProperty(required=True)

Expand All @@ -862,7 +862,7 @@ def put(self, **kwargs):
# Standards details.
standardization = db.IntegerProperty(required=True)
spec_link = db.LinkProperty()
tag_review = db.StringProperty()
tag_review = db.StringProperty(multiline=True)
prefixed = db.BooleanProperty()

explainer_links = db.StringListProperty()
Expand All @@ -877,10 +877,10 @@ def put(self, **kwargs):
safari_views_link = db.LinkProperty()
web_dev_views_link = db.LinkProperty()

ff_views_notes = db.StringProperty()
ie_views_notes = db.StringProperty()
safari_views_notes = db.StringProperty()
web_dev_views_notes = db.StringProperty()
ff_views_notes = db.StringProperty(multiline=True)
ie_views_notes = db.StringProperty(multiline=True)
safari_views_notes = db.StringProperty(multiline=True)
web_dev_views_notes = db.StringProperty(multiline=True)

doc_links = db.StringListProperty()
sample_links = db.StringListProperty()
Expand Down Expand Up @@ -1080,7 +1080,7 @@ class FeatureForm(forms.Form):
widget=forms.Textarea(attrs={'rows': 2, 'cols': 50, 'maxlength': 200}),
help_text='Explanation for why this feature is, or is not, supported on all platforms.')

wpt = forms.BooleanField(required=True, initial=False, label='Web Platform Tests', help_text='Is this feature fully tested in Web Platform Tests?')
wpt = forms.BooleanField(required=False, initial=False, label='Web Platform Tests', help_text='Is this feature fully tested in Web Platform Tests?')

wpt_descr = forms.CharField(label='Web Platform Tests Description', required=True,
widget=forms.Textarea(attrs={'cols': 50, 'maxlength': 500}),
Expand Down
8 changes: 4 additions & 4 deletions static/js/admin/feature_form.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,12 @@ const FORM_FIELD_GRAPH = {
INTENT_REMOVE: HIDDEN,
},
'wpt': {
INTENT_IMPLEMENT: VISIBLE_REQUIRED,
INTENT_IMPLEMENT: VISIBLE_OPTIONAL,
INTENT_EXPERIMENT: HIDDEN,
INTENT_EXTEND_TRIAL: HIDDEN,
INTENT_IMPLEMENT_SHIP: VISIBLE_REQUIRED,
INTENT_SHIP: VISIBLE_REQUIRED,
INTENT_REMOVE: VISIBLE_REQUIRED,
INTENT_IMPLEMENT_SHIP: VISIBLE_OPTIONAL,
INTENT_SHIP: VISIBLE_OPTIONAL,
INTENT_REMOVE: VISIBLE_OPTIONAL,
},
'wpt_descr': {
INTENT_IMPLEMENT: VISIBLE_REQUIRED,
Expand Down

0 comments on commit 79a646b

Please sign in to comment.