Skip to content

Commit

Permalink
Merge pull request #3933 from NCI-Agency/AB-295-fix-inactivating-fill…
Browse files Browse the repository at this point in the history
…ed-position

Fix name conflict while importing bootstrap component
  • Loading branch information
gjvoosten authored Nov 29, 2021
2 parents 325768c + 7b4a6ee commit a93db91
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions client/src/pages/positions/Form.js
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

0 comments on commit a93db91

Please sign in to comment.