Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W
This commit is contained in:
commit
fb4275fb05
@ -132,7 +132,7 @@ const CreateRole = ({ modalType, onClose }) => {
|
||||
</div>
|
||||
|
||||
|
||||
<div className="col-12 col-md-12 border">
|
||||
<div className="col-12 col-md-12">
|
||||
|
||||
|
||||
{masterFeatures.map((feature, featureIndex) => (
|
||||
|
@ -177,10 +177,10 @@ const EditMaster = ({ master, onClose }) => {
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="col-12 col-md-12 mx-2s " >
|
||||
<div className="col-12 col-md-12 mx-2s" >
|
||||
|
||||
{masterFeatures.map((feature, featureIndex) => (
|
||||
<div className="row my-3" key={feature.id} style={{ marginLeft: "0px" }}>
|
||||
<div className="row my-1" key={feature.id} style={{ marginLeft: "0px" }}>
|
||||
|
||||
<div className="col-12 col-md-3 d-flex text-start align-items-center" style={{ wordWrap: 'break-word' }}>
|
||||
<span className="fs">{feature.name}</span>
|
||||
@ -188,7 +188,7 @@ const EditMaster = ({ master, onClose }) => {
|
||||
<div className="col-12 col-md-1">
|
||||
|
||||
</div>
|
||||
<div className="col-12 col-md-8 d-flex justify-content-start align-items-center flex-wrap">
|
||||
<div className="col-12 col-md-8 d-flex justify-content-start align-items-center flex-wrap ">
|
||||
{feature.featurePermissions.map((perm, permIndex) => {
|
||||
const refIndex = (featureIndex * 10) + permIndex;
|
||||
return (
|
||||
@ -240,6 +240,7 @@ const EditMaster = ({ master, onClose }) => {
|
||||
|
||||
|
||||
</div>
|
||||
<hr className="hr my-1 py-1" />
|
||||
</div>
|
||||
))}
|
||||
{errors.permissions && (
|
||||
|
Loading…
x
Reference in New Issue
Block a user