Skip to content

Regression: Reset section button #18007

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

Merged
ggazzo merged 2 commits into from
Jun 25, 2020
Merged

Regression: Reset section button #18007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3c189e
Fix reset section button
MartinSchoeler Jun 22, 2020
53bae7d
Merge branch 'develop' into fix-button-style
tassoevan Jun 24, 2020
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
14 changes: 7 additions & 7 deletions client/admin/settings/Section.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@ export function Section({ children, groupId, hasReset = true, help, sectionName,
<FieldGroup>
{editableSettings.map((setting) => <Setting key={setting._id} settingId={setting._id} sectionChanged={changed} />)}

{hasReset && canReset && <Button
children={t('Reset_section_settings')}
danger
data-section={sectionName}
ghost
onClick={handleResetSectionClick}
/>}

{children}
</FieldGroup>
{hasReset && canReset && <Button
children={t('Reset_section_settings')}
danger
marginBlockStart={'x16'}
data-section={sectionName}
onClick={handleResetSectionClick}
/>}
</Accordion.Item>;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2962,7 +2962,7 @@
"Reset": "Reset",
"Reset_E2E_Key": "Reset E2E Key",
"Reset_password": "Reset password",
"Reset_section_settings": "Reset Section Settings",
"Reset_section_settings": "Reset Section to Default",
"Reset_Connection": "Reset Connection",
"Responding": "Responding",
"Response_description_pre": "If the handler wishes to post a response back into the channel, the following JSON should be returned as the body of the response:",
Expand Down