admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W

Browse Source
This commit is contained in:
Kartik sharma 2025-06-30 17:12:28 +05:30
commit fb4275fb05
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/master/CreateRole.jsx
View File

@ -132,7 +132,7 @@ const CreateRole = ({ modalType, onClose }) => {
</div> </div>
<div className="col-12 col-md-12 border"> <div className="col-12 col-md-12">
{masterFeatures.map((feature, featureIndex) => ( {masterFeatures.map((feature, featureIndex) => (

7
src/components/master/EditRole.jsx
View File

@ -177,10 +177,10 @@ const EditMaster = ({ master, onClose }) => {
)} )}
</div> </div>
<div className="col-12 col-md-12 mx-2s " > <div className="col-12 col-md-12 mx-2s" >
{masterFeatures.map((feature, featureIndex) => ( {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' }}> <div className="col-12 col-md-3 d-flex text-start align-items-center" style={{ wordWrap: 'break-word' }}>
<span className="fs">{feature.name}</span> <span className="fs">{feature.name}</span>
@ -188,7 +188,7 @@ const EditMaster = ({ master, onClose }) => {
<div className="col-12 col-md-1"> <div className="col-12 col-md-1">
</div> </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) => { {feature.featurePermissions.map((perm, permIndex) => {
const refIndex = (featureIndex * 10) + permIndex; const refIndex = (featureIndex * 10) + permIndex;
return ( return (
@ -240,6 +240,7 @@ const EditMaster = ({ master, onClose }) => {
</div> </div>
<hr className="hr my-1 py-1" />
</div> </div>
))} ))}
{errors.permissions && ( {errors.permissions && (