Skip to content
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

Fix name conflict while importing bootstrap component #3933

Merged
merged 1 commit into from
Nov 29, 2021
Merged

Fix name conflict while importing bootstrap component #3933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions client/src/pages/positions/Form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import DictionaryField from "HOC/DictionaryField"
import { Location, Organization, Position } from "models"
import PropTypes from "prop-types"
import React, { useContext, useState } from "react"
import { Button } from "react-bootstrap"
import { Button, Form as FormBS } from "react-bootstrap"
import { useHistory } from "react-router-dom"
import LOCATIONS_ICON from "resources/locations.png"
import ORGANIZATIONS_ICON from "resources/organizations.png"
Expand Down Expand Up @@ -214,14 +214,14 @@ const PositionForm = ({ edit, title, initialValues, notesComponent }) => {
onChange={value => setFieldValue("status", value)}
>
{willAutoKickPerson && (
<Form.Text>
<FormBS.Text>
<span className="text-danger">
Setting this position to inactive will automatically
remove{" "}
<LinkTo modelType="Person" model={values.person} /> from
this position.
</span>
</Form.Text>
</FormBS.Text>
)}
</FastField>

Expand Down