diff --git a/imports/ui/BarraNav/BarraNav.jsx b/imports/ui/BarraNav/BarraNav.jsx index a071deb..ed46184 100644 --- a/imports/ui/BarraNav/BarraNav.jsx +++ b/imports/ui/BarraNav/BarraNav.jsx @@ -42,7 +42,7 @@ const BarraNav = ({esAdministrador, setEsAdministrador}) => { - + { esAdministrador && } ; }; diff --git a/imports/ui/Usuaris.jsx b/imports/ui/Usuaris.jsx index 0e7929f..a1f0955 100644 --- a/imports/ui/Usuaris.jsx +++ b/imports/ui/Usuaris.jsx @@ -248,8 +248,9 @@ const U = ({u, esAdministrador, setUsrSeleccionat}) => { -const AssignadorDeRols = ({pobles, ambitGeneral, esEditor, rols, usrSeleccionat, ambitsUSel}) => { +const AssignadorDeRols = ({pobles, esEditor, rols, usrSeleccionat, ambitsUSel}) => { const [creantRol, setCreantRol] = useState(false); + const [ambitGeneral, setAmbitGeneral] = useState(false); // const [ambitsUSel, setAmbitsUSel] = useState([]); // let ambitsUSel; // let ambitsUSel = []; @@ -342,16 +343,20 @@ const AssignadorDeRols = ({pobles, ambitGeneral, esEditor, rols, usrSeleccionat, backgroundColor: `#fffa` }}>
{ - Meteor.callAsync('assignaRol', usrSeleccionat._id, d.get('selRol'), d.get('selAmbit')); + if (ambitGeneral) { + Meteor.callAsync('assignaRol', usrSeleccionat._id, d.get('selRol')); + } else { + Meteor.callAsync('assignaRol', usrSeleccionat._id, d.get('selRol'), d.get('selAmbit')); + } }}> Àmbit:
Rol: