betagouv
/
mon-entreprise
mirror of https://github.com/betagouv/mon-entreprise
1
0
Fork 0
Code Releases Activity

Merge pull request #362 from betagouv/bug-passer-commune 

Bug "passer" pour la question de la commune
pull/364/head
Mael 2018-09-13 17:59:20 +02:00 committed by GitHub
parent 2a6f885aa9 d8e2462a4d
commit a0831d4317
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
source/components/conversation/FormDecorator.js
View File

@ -62,32 +62,40 @@ export var FormDecorator = formType => RenderField =>
return (
<div className={classNames('step', formType)}>
<div className="unfoldedHeader">
<div className="step-question">
<h1> {this.props.question} {!inversion && <Explicable dottedName={fieldName}/>}</h1>
<div
className="step-subquestion"
dangerouslySetInnerHTML={{ __html: subquestion }}
/>
</div>
<div className="unfoldedHeader">
<div className="step-question">
<h1>
{' '}
{this.props.question}{' '}
{!inversion && <Explicable dottedName={fieldName} />}
</h1>
<div
className="step-subquestion"
dangerouslySetInnerHTML={{ __html: subquestion }}
/>
</div>
{defaultValue != null && (
<IgnoreStepButton
action={() => {
setFormValue(fieldName, '' + defaultValue)
submit('ignore')
}}
/>
)}
<fieldset>
<Field
component={RenderField}
name={fieldName}
{...stepProps}
themeColours={themeColours}
/>
</fieldset>
</div>
{defaultValue != null && (
<IgnoreStepButton
action={() => {
setFormValue(
fieldName,
typeof defaultValue == 'object'
? JSON.stringify(defaultValue)
: '' + defaultValue
)
submit('ignore')
}}
/>
)}
<fieldset>
<Field
component={RenderField}
name={fieldName}
{...stepProps}
themeColours={themeColours}
/>
</fieldset>
</div>
)
}

4
source/règles/externalized.yaml
View File

@ -855,9 +855,7 @@ entreprise . association non lucrative:
calculées à l'échelle de l'établissement et sont fonction de règlementations
locales.
suggestions.fr: utilisation d'une API
établissement . commune:
titre.en: City of the establishment
titre.fr: Commune de l'établissement
établissement . localisation:
question.en: In which city is the establishment located?
question.fr: Dans quelle commune l'établissement est-il implanté ?
description.en: |-