Changeset 281 for ether_megapoli
- Timestamp:
- 12/02/11 17:03:30 (12 years ago)
- Location:
- ether_megapoli/trunk
- Files:
-
- 9 deleted
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
ether_megapoli/trunk/domain/interface/com/ether/user/UserRole.java
r272 r281 9 9 COORDINATOR, 10 10 ADMINISTRATOR, 11 TECHNICIEN, 11 12 } -
ether_megapoli/trunk/service/implementation/com/medias/megapoli/struts/actions/LoadMetadataAction.java
r151 r281 1 1 package com.medias.megapoli.struts.actions; 2 2 3 import com.ether.user.UserRole; 3 4 import com.medias.annuaire.Personne; 5 import com.medias.megapoli.struts.forms.MetadataForm; 4 6 import com.medias.xml.metadata.Metadata; 5 import com.medias.megapoli.struts.forms.MetadataForm;6 7 import javax.servlet.ServletException;8 import javax.servlet.http.HttpServletRequest;9 import javax.servlet.http.HttpServletResponse;10 11 7 import org.apache.struts.action.Action; 12 8 import org.apache.struts.action.ActionError; … … 16 12 import org.apache.struts.action.ActionMapping; 17 13 14 import javax.servlet.ServletException; 15 import javax.servlet.http.HttpServletRequest; 16 import javax.servlet.http.HttpServletResponse; 17 18 18 /** 19 19 * @author combaz 20 * Created on 15 févr. 200520 * Created on 15 févr. 2005 21 21 */ 22 public class LoadMetadataAction extends Action { 23 public ActionForward execute (ActionMapping mapping,ActionForm form, 24 HttpServletRequest request, 25 HttpServletResponse response) 26 throws ServletException { 27 String target = "failure"; 28 String path = request.getParameter ("metadataUri"); 29 ActionErrors errors = new ActionErrors (); 30 31 if (form != null) { 32 MetadataForm mform = (MetadataForm)form; 33 if ((path != null) && (path.length () != 0)) { 34 try { 35 // On charge la métadonnée... 36 Metadata meta = new Metadata (path); 37 mform.setMetadata (meta); 22 public class LoadMetadataAction 23 extends Action 24 { 25 public ActionForward execute( ActionMapping mapping, ActionForm form, 26 HttpServletRequest request, 27 HttpServletResponse response ) 28 throws ServletException 29 { 30 String target = "failure"; 31 String path = request.getParameter( "metadataUri" ); 32 ActionErrors errors = new ActionErrors(); 38 33 39 // On vérifie les droits de l'utilisateur sur la métadonnée 40 Personne user = (Personne) request.getSession ().getAttribute ("SES_USER"); 41 String rights = "read"; 42 if((user.getRoles ().equals ("coordinateur")) || (user.hasSet (meta.getPres ().getNom ()))) 43 rights = "write"; 44 request.getSession ().setAttribute ("SES_RIGHTS", rights); 45 46 target = "success"; 47 } 48 catch (Exception e) { 49 System.out.println ("exception_LoadMetadataAction"); 50 errors.add (ActionErrors.GLOBAL_MESSAGE, new ActionError ("errors.upload.metadata.notfound")); 51 52 e.printStackTrace (); 53 } 54 } 55 } 56 57 if(!errors.isEmpty ()){ 58 saveErrors (request, errors); 59 } 60 61 return mapping.findForward (target); 62 } 34 if( form != null ) 35 { 36 MetadataForm mform = (MetadataForm) form; 37 if( ( path != null ) && ( path.length() != 0 ) ) 38 { 39 try 40 { 41 // On charge la métadonnée... 42 Metadata meta = new Metadata( path ); 43 mform.setMetadata( meta ); 44 45 // On vérifie les droits de l'utilisateur sur la métadonnée 46 Personne user = (Personne) request.getSession().getAttribute( "SES_USER" ); 47 String rights = "read"; 48 if( ( user.getRoles().equals( UserRole.COORDINATOR.name() ) ) || ( user.hasSet( meta.getPres().getNom() ) ) ) 49 rights = "write"; 50 request.getSession().setAttribute( "SES_RIGHTS", rights ); 51 52 target = "success"; 53 } 54 catch( Exception e ) 55 { 56 System.out.println( "exception_LoadMetadataAction" ); 57 errors.add( ActionErrors.GLOBAL_MESSAGE, new ActionError( "errors.upload.metadata.notfound" ) ); 58 59 e.printStackTrace(); 60 } 61 } 62 } 63 64 if( !errors.isEmpty() ) 65 { 66 saveErrors( request, errors ); 67 } 68 69 return mapping.findForward( target ); 70 } 63 71 } -
ether_megapoli/trunk/service/implementation/com/medias/megapoli/struts/actions/PrepareTreeAction.java
r151 r281 1 1 package com.medias.megapoli.struts.actions; 2 2 3 import javax.servlet.ServletException;4 import javax.servlet.http.HttpServletRequest;5 import javax.servlet.http.HttpServletResponse;6 3 import com.ether.user.UserRole; 4 import com.medias.annuaire.Personne; 5 import com.medias.megapoli.struts.forms.PrepareTreeForm; 6 import com.medias.xml.hierarchie.Hierarchie; 7 7 import org.apache.struts.action.Action; 8 8 import org.apache.struts.action.ActionError; … … 11 11 import org.apache.struts.action.ActionForward; 12 12 import org.apache.struts.action.ActionMapping; 13 import com.medias.annuaire.Personne; 14 import com.medias.xml.hierarchie.Hierarchie; 15 import com.medias.megapoli.struts.forms.PrepareTreeForm; 13 14 import javax.servlet.ServletException; 15 import javax.servlet.http.HttpServletRequest; 16 import javax.servlet.http.HttpServletResponse; 16 17 17 18 18 19 /** 19 20 * @author combaz 20 * 21 * Created on 24 févr. 200521 * <p/> 22 * Created on 24 févr. 2005 22 23 */ 23 public class PrepareTreeAction extends Action { 24 public ActionForward execute (ActionMapping mapping, 25 ActionForm form, 26 HttpServletRequest request, 27 HttpServletResponse response) 28 throws ServletException { 29 30 String target = "failure"; 31 ActionErrors errors = new ActionErrors (); 32 String path = (String)request.getSession ().getServletContext ().getAttribute ("DataDescPathName"); 33 Hierarchie arborescence; 24 public class PrepareTreeAction 25 extends Action 26 { 27 public ActionForward execute( ActionMapping mapping, 28 ActionForm form, 29 HttpServletRequest request, 30 HttpServletResponse response ) 31 throws ServletException 32 { 33 34 String target = "failure"; 35 ActionErrors errors = new ActionErrors(); 36 String path = (String) request.getSession().getServletContext().getAttribute( "DataDescPathName" ); 37 Hierarchie arborescence; 34 38 // Hierarchie tree = (Hierarchie)request.getSession ().getServletContext ().getAttribute ("APP_UPLOADTREE"); 35 36 if (form != null) { 37 PrepareTreeForm pTreeForm = (PrepareTreeForm)form; 38 try { 39 // On charge la métadonnée... 40 if (path != null) { 41 arborescence = new Hierarchie(path); 42 pTreeForm.setHierarchie (arborescence); 43 // On vérifie les droits de l'utilisateur sur la métadonnée 44 Personne user = (Personne) request.getSession ().getAttribute ("SES_USER"); 45 if (user == null) { 46 target = "login"; 47 } else { 48 String rights = "read"; 49 if ((user.getRoles ().equals ("coordinateur"))) 50 rights = "write"; 51 request.getSession ().setAttribute ("SES_RIGHTS", rights); 52 // tree.createTreeView (); 53 target = "success"; 54 } 55 } else { 56 throw new Exception ("Chemin vers le fichier de description de hierarchie xml introuvable"); 57 } 58 } 59 catch (Exception e) { 60 System.out.println ("exception_PrepareTreeAction"); 61 errors.add (ActionErrors.GLOBAL_MESSAGE, new ActionError ("errors.upload.prepareTree.failed")); 62 e.printStackTrace (); 63 } 64 } 65 66 if (!errors.isEmpty ()){ 67 saveErrors (request, errors); 68 } 69 70 return mapping.findForward (target); 71 } 72 39 40 if( form != null ) 41 { 42 PrepareTreeForm pTreeForm = (PrepareTreeForm) form; 43 try 44 { 45 // On charge la métadonnée... 46 if( path != null ) 47 { 48 arborescence = new Hierarchie( path ); 49 pTreeForm.setHierarchie( arborescence ); 50 // On vérifie les droits de l'utilisateur sur la métadonnée 51 Personne user = (Personne) request.getSession().getAttribute( "SES_USER" ); 52 if( user == null ) 53 { 54 target = "login"; 55 } 56 else 57 { 58 String rights = "read"; 59 if( ( user.getRoles().equals( UserRole.COORDINATOR.name() ) ) ) 60 rights = "write"; 61 request.getSession().setAttribute( "SES_RIGHTS", rights ); 62 // tree.createTreeView (); 63 target = "success"; 64 } 65 } 66 else 67 { 68 throw new Exception( "Chemin vers le fichier de description de hierarchie xml introuvable" ); 69 } 70 } 71 catch( Exception e ) 72 { 73 System.out.println( "exception_PrepareTreeAction" ); 74 errors.add( ActionErrors.GLOBAL_MESSAGE, new ActionError( "errors.upload.prepareTree.failed" ) ); 75 e.printStackTrace(); 76 } 77 } 78 79 if( !errors.isEmpty() ) 80 { 81 saveErrors( request, errors ); 82 } 83 84 return mapping.findForward( target ); 85 } 86 73 87 } -
ether_megapoli/trunk/web/WEB-INF/struts-config.xml
r261 r281 152 152 validate="false"> 153 153 <!-- input="/data/data.jsp"> --> 154 <forward name="success" path="/ data/logon.jsp"/>154 <forward name="success" path="/project/login.jsp"/> 155 155 </action> 156 156 <!-- --> … … 167 167 name="logonForm" 168 168 validate="true" 169 input="/ data/logon.jsp">169 input="/project/login.jsp"> 170 170 <forward name="cancel" path="/data/data.jsp"/> 171 171 <!-- <forward name="input" path="/data/logon.jsp"/> --> -
ether_megapoli/trunk/web/WEB-INF/xml/uploadFiles.xsl
r260 r281 13 13 <xsl:text><![CDATA[<%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%> 14 14 <%@ page import="com.medias.xml.hierarchie.Hierarchie"%> 15 <%@ page import="com.ether.user.UserRole" %> 15 16 16 17 <%@ page language="java" contentType="text/html; charset=UTF-8"%> … … 57 58 </logic:equal> 58 59 </logic:iterate> 59 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">60 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 60 61 <bean:define id="modify" value="true"/> 61 62 </logic:equal> -
ether_megapoli/trunk/web/WEB-INF/xml/uploadTree.xsl
r260 r281 12 12 <xsl:text><![CDATA[<%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%> 13 13 <%@ page import="com.medias.xml.hierarchie.Hierarchie"%> 14 14 <%@ page import="com.ether.user.UserRole" %> 15 15 16 <%@ page language="java" contentType="text/html; charset=UTF-8"%> 16 17 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%> … … 35 36 </xsl:apply-templates> 36 37 <xsl:text><![CDATA[ 37 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">38 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 38 39 <bean:define id="parent" value="]]></xsl:text> 39 40 <xsl:value-of select="@name"/> … … 59 60 <xsl:value-of select="@name"/> 60 61 <xsl:text><![CDATA[ 61 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">62 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 62 63 63 64 <html:hidden property="path" value="]]></xsl:text> … … 123 124 </logic:equal> 124 125 </logic:iterate> 125 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">126 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 126 127 <bean:define id="modify" value="true"/> 127 128 </logic:equal> -
ether_megapoli/trunk/web/backoffice/user-script.jsp
r280 r281 80 80 $.ajax( { 81 81 url: "backoffice?methodName=modifyUser&" + parametersUrl, 82 success:jQuery.proxy( this.handle ModifyUser, this ),82 success:jQuery.proxy( this.handleUser, this ), 83 83 error: jQuery.proxy( this.showErrors, [this] ) 84 84 } ); … … 117 117 this.displayWaitingUsers(); 118 118 this.displayUsers(); 119 },120 121 handleModifyUser: function( result )122 {123 this.handleUser( result );124 119 this.clearAddOrModifyUserFields(); 125 120 this.updateAddUserButtonAndTitle(); 126 127 }, 121 }, 122 128 123 // DISPLAYS ******************************************************** 129 124 displayTRForUser: function( user ) … … 142 137 tdEmail.html( user.email ); 143 138 tr.append( tdEmail ); 144 var tdPwd = $( document.createElement( "td" ) );145 tdPwd.html( user.password );146 tr.append( tdPwd );147 139 var tdRole = $( document.createElement( "td" ) ); 148 140 tdRole.html( user.role ); … … 288 280 var actualState = $( "#keepSamePassword" ).attr( 'checked' ); 289 281 $( "#password" ).attr( 'disabled', actualState ); 282 if( actualState ) 283 $( "#password" ).val( '' ); 290 284 }, 291 285 … … 298 292 $( "#add_or_modify_user" ).bind( 'click', this, jQuery.proxy( this.requestAddUser, this ) ); 299 293 $( "#add_or_modify_user" ).html( interfaceTexts["bo.add"] ); 294 $( "#password" ).attr( 'disabled', false ); 295 $( "#keepSamePassword" ).attr( 'disabled', true ); 300 296 }, 301 297 … … 307 303 $( "#add_or_modify_user" ).bind( 'click', this, jQuery.proxy( this.requestModifyUser, this ) ); 308 304 $( "#add_or_modify_user" ).html( interfaceTexts["bo.modify"] ); 305 $( "#password" ).attr( 'disabled', true ); 306 $( "#keepSamePassword" ).attr( 'disabled', false ); 309 307 }, 310 308 … … 317 315 .removeAttr( 'selected' ); 318 316 319 $( "#keepSamePassword" ).attr( 'disabled', true );320 317 this.selectRoles.selectFirst( false ); 321 318 this.selectStates.selectFirst( false ); -
ether_megapoli/trunk/web/backoffice/user.jsp
r280 r281 38 38 <th><bean:message key="bo.user.firstName"/></th> 39 39 <th><bean:message key="bo.user.email"/></th> 40 <th><bean:message key="bo.user.password"/></th>41 40 <th><bean:message key="bo.user.role"/></th> 42 41 <th><bean:message key="bo.user.creationDate"/></th> … … 60 59 <th><bean:message key="bo.user.firstName"/></th> 61 60 <th><bean:message key="bo.user.email"/></th> 62 <th><bean:message key="bo.user.password"/></th>63 61 <th><bean:message key="bo.user.role"/></th> 64 62 <th><bean:message key="bo.user.creationDate"/></th> -
ether_megapoli/trunk/web/data/metadata.jsp
r261 r281 3 3 <%@ page import="com.medias.Calcul"%> 4 4 <%@ page import="com.medias.DateTime"%> 5 <%@ page import="com.ether.user.UserRole" %> 5 6 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%> 6 7 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html"%> … … 133 134 <td rowspan="2"><bean:message key="data.upload.metadata.presentation.dest"/> : </td> 134 135 <td> 135 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">136 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 136 137 <nested:radio property="dest" value="SGBD"> 137 138 <bean:message key="data.upload.metadata.presentation.dest.sgbd"/> 138 139 </nested:radio> 139 140 </logic:equal> 140 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">141 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 141 142 <nested:radio disabled="true" property="dest" value="SGBD"> 142 143 <bean:message key="data.upload.metadata.presentation.dest.sgbd"/> … … 147 148 <tr> 148 149 <td> 149 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">150 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 150 151 <nested:radio property="dest" value="FTP"> 151 152 <bean:message key="data.upload.metadata.presentation.dest.ftp"/> 152 153 </nested:radio> 153 154 </logic:equal> 154 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">155 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 155 156 <nested:radio disabled="true" property="dest" value="FTP"> 156 157 <bean:message key="data.upload.metadata.presentation.dest.ftp"/> … … 162 163 <td rowspan="5"><bean:message key="data.upload.metadata.presentation.cat"/> * : </td> 163 164 <td> 164 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">165 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 165 166 <nested:radio property="cat" value="AVION"><bean:message key="data.categ1"/></nested:radio> 166 167 </logic:equal> 167 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">168 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 168 169 <nested:radio disabled="true" property="cat" value="AVION"><bean:message key="data.categ1"/></nested:radio> 169 170 </logic:notEqual> … … 171 172 </tr> 172 173 <tr><td> 173 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">174 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 174 175 <nested:radio property="cat" value="SURF_FIXE"><bean:message key="data.categ2"/></nested:radio> 175 176 </logic:equal> 176 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">177 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 177 178 <nested:radio disabled="true" property="cat" value="SURF_FIXE"><bean:message key="data.categ2"/></nested:radio> 178 179 </logic:notEqual> 179 180 </td></tr> 180 181 <tr><td> 181 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">182 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 182 183 <nested:radio property="cat" value="SURF_MOBILE"><bean:message key="data.categ3"/></nested:radio> 183 184 </logic:equal> 184 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">185 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 185 186 <nested:radio disabled="true" property="cat" value="SURF_MOBILE"><bean:message key="data.categ3"/></nested:radio> 186 187 </logic:notEqual> … … 203 204 <table class="${idP}"> 204 205 <tr> 205 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur"><bean:define id="nbCol" value="8"/></logic:equal>206 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur"><bean:define id="nbCol" value="7"/></logic:notEqual>206 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"><bean:define id="nbCol" value="8"/></logic:equal> 207 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"><bean:define id="nbCol" value="7"/></logic:notEqual> 207 208 <td rowspan="${nbCol}" nowrap> 208 209 <bean:message key="data.upload.metadata.contact"/> <nested:write name="persId"/></td> 209 210 <td><bean:message key="data.upload.metadata.contact.nom"/> : </td> 210 211 <td colspan="2"> 211 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">212 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 212 213 <input type="text" id="contactNom_${persId}" name="metadata.pres.contacts[${persId}].nom" value="${contactNom}"/> 213 214 <%--nested:text property="nom"/--%> 214 215 </logic:equal> 215 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">216 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 216 217 <nested:write property="nom"/> 217 218 </logic:notEqual> … … 221 222 <td><bean:message key="data.upload.metadata.contact.prenom"/> : </td> 222 223 <td colspan="2"> 223 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">224 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 224 225 <input type="text" id="contactPrenom_${persId}" name="metadata.pres.contacts[${persId}].prenom" value="${contactPrenom}"/> 225 226 <%--nested:text property="prenom"/--%> 226 227 </logic:equal> 227 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">228 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 228 229 <nested:write property="prenom"/> 229 230 </logic:notEqual> … … 233 234 <td><bean:message key="data.upload.metadata.contact.org"/> : </td> 234 235 <td colspan="2"> 235 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">236 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 236 237 <input type="text" id="contactOrg_${persId}" name="metadata.pres.contacts[${persId}].org" value="${contactOrg}"/> 237 238 <%--nested:text property="organisme"/--%> 238 239 </logic:equal> 239 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">240 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 240 241 <nested:write property="organisme"/> 241 242 </logic:notEqual> … … 245 246 <td><bean:message key="data.upload.metadata.contact.mail"/> * : </td> 246 247 <td colspan="2"> 247 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">248 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 248 249 <input type="text" id="contactMail_${persId}" name="metadata.pres.contacts[${persId}].mail" value="${contactMail}"/> 249 250 <%--nested:text property="mail"/--%> 250 251 </logic:equal> 251 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">252 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 252 253 <nested:write property="mail"/> 253 254 </logic:notEqual> 254 255 </td> 255 256 </tr> 256 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">257 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 257 258 <tr> 258 259 <td><bean:message key="data.upload.metadata.contact.mdp"/> * : </td> … … 266 267 <td rowspan="3"><bean:message key="data.upload.metadata.contact.role"/> * : </td> 267 268 <td colspan="2"> 268 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">269 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 269 270 <input type="radio" id="contactDef_${persId}" name="metadata.pres.contacts[${persId}].role" value="default" <%=(contactRole.equals("default")?"checked":"")%>> 270 271 <%--nested:radio property="role" value="default"--%><bean:message key="data.upload.metadata.description.default"/><%--/nested:radio--%> 271 272 </logic:equal> 272 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">273 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 273 274 <nested:radio disabled="true" property="role" value="default"><bean:message key="data.upload.metadata.description.default"/></nested:radio> 274 275 </logic:notEqual> … … 277 278 <tr> 278 279 <td colspan="2"> 279 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">280 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 280 281 <input type="radio" id="contactPi_${persId}" name="metadata.pres.contacts[${persId}].role" value="pi" <%=(contactRole.equals("pi")?"checked":"")%>> 281 282 <%--nested:radio property="role" value="pi"--%><bean:message key="data.upload.metadata.description.pi"/><%--/nested:radio--%> 282 283 </logic:equal> 283 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">284 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 284 285 <nested:radio disabled="true" property="role" value="pi"><bean:message key="data.upload.metadata.description.pi"/></nested:radio> 285 286 </logic:notEqual> … … 288 289 <tr> 289 290 <td> 290 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">291 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 291 292 <input type="radio" id="contactTech_${persId}" name="metadata.pres.contacts[${persId}].role" value="tech" <%=(contactRole.equals("tech")?"checked":"")%>> 292 293 <%--nested:radio property="role" value="tech"--%><bean:message key="data.upload.metadata.description.tech"/><%--/nested:radio--%> 293 294 </logic:equal> 294 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">295 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 295 296 <nested:radio disabled="true" property="role" value="tech"><bean:message key="data.upload.metadata.description.tech"/></nested:radio> 296 297 </logic:notEqual> 297 298 </td> 298 299 <td> 299 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">300 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 300 301 <input type="button" value="<bean:message key="data.upload.metadata.deletePers"/>" onclick="removeContact('${contextPath}',${persId})"/> 301 302 <%--html:submit indexed="true" property="mess"> … … 303 304 </html:submit--%> 304 305 </logic:equal> 305 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">306 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 306 307 307 308 </logic:notEqual> … … 312 313 </td></tr> 313 314 <tr><td> 314 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">315 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 315 316 <input type="button" value="<bean:message key="data.upload.metadata.newPers"/>" onclick="addContact('${contextPath}')" class="add"/> 316 317 <%--html:submit property="mess[0]" styleClass="add"> … … 1293 1294 <td><bean:message key="data.upload.metadata.contact.nom"/> : </td> 1294 1295 <td> 1295 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1296 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1296 1297 <nested:text property="nom"/> 1297 1298 </logic:equal> 1298 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">1299 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1299 1300 <nested:write property="nom"/> 1300 1301 </logic:notEqual> … … 1304 1305 <td><bean:message key="data.upload.metadata.contact.prenom"/> : </td> 1305 1306 <td> 1306 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1307 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1307 1308 <nested:text property="prenom"/> 1308 1309 </logic:equal> 1309 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">1310 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1310 1311 <nested:write property="prenom"/> 1311 1312 </logic:notEqual> … … 1315 1316 <td><bean:message key="data.upload.metadata.contact.org"/> : </td> 1316 1317 <td> 1317 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1318 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1318 1319 <nested:text property="organisme"/> 1319 1320 </logic:equal> 1320 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">1321 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1321 1322 <nested:write property="organisme"/> 1322 1323 </logic:notEqual> … … 1326 1327 <td><bean:message key="data.upload.metadata.contact.mail"/> : </td> 1327 1328 <td> 1328 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1329 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1329 1330 <nested:text property="mail"/> 1330 1331 </logic:equal> 1331 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">1332 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1332 1333 <nested:write property="mail"/> 1333 1334 </logic:notEqual> … … 1346 1347 <td><bean:message key="data.upload.metadata.time.date"/> : </td> 1347 1348 <td> 1348 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1349 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1349 1350 <nested:text property="date"/><i>(<%=DateTime.formatDateStandard%>)</i> 1350 1351 </logic:equal> 1351 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">1352 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1352 1353 <nested:write property="date"/> 1353 1354 </logic:notEqual> … … 1357 1358 <td><bean:message key="data.upload.metadata.time.heure"/> : </td> 1358 1359 <td> 1359 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1360 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1360 1361 <nested:text property="heure"/><i>(<%=DateTime.formatHeureStandard%>)</i> 1361 1362 </logic:equal> 1362 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">1363 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1363 1364 <nested:write property="heure"/> 1364 1365 </logic:notEqual> … … 1377 1378 <td><bean:message key="data.upload.metadata.time.date"/> : </td> 1378 1379 <td> 1379 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1380 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1380 1381 <nested:text property="date"/><i>(<%=DateTime.formatDateStandard%>)</i> 1381 1382 </logic:equal> 1382 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">1383 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1383 1384 <nested:write property="date"/> 1384 1385 </logic:notEqual> … … 1388 1389 <td><bean:message key="data.upload.metadata.time.heure"/> : </td> 1389 1390 <td> 1390 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1391 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1391 1392 <nested:text property="heure"/><i>(<%=DateTime.formatHeureStandard%>)</i> 1392 1393 </logic:equal> 1393 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">1394 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1394 1395 <nested:write property="heure"/> 1395 1396 </logic:notEqual> … … 1403 1404 <td><bean:message key="data.upload.metadata.integration.nbfiles"/> : </td> 1404 1405 <td> 1405 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1406 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1406 1407 <nested:text property="nbFiles"/> 1407 1408 </logic:equal> 1408 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">1409 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1409 1410 <nested:write property="nbFiles"/> 1410 1411 </logic:notEqual> … … 1414 1415 <td><bean:message key="data.upload.metadata.integration.size"/> : </td> 1415 1416 <td> 1416 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1417 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1417 1418 <nested:textarea property="size"/> 1418 1419 </logic:equal> 1419 <logic:notEqual name="SES_USER" property="roles" scope="session" value=" coordinateur">1420 <logic:notEqual name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1420 1421 <nested:write property="size"/> 1421 1422 </logic:notEqual> -
ether_megapoli/trunk/web/data/upload.jsp
r260 r281 2 2 <%@ page import="com.medias.xml.hierarchie.Hierarchie" contentType="text/html; charset=UTF-8" %> 3 3 <%@ page import="com.medias.Context" %> 4 <%@ page import="com.ether.user.UserRole" %> 4 5 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> 5 6 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> … … 57 58 <html:form action="/ConfirmDeletion"> 58 59 <html:img page="/resources/images/utils/folder.png" alt="folder"/> <nested:write property="nomJeu"/> 59 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur"> 60 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 60 61 <html:hidden value="${cheminJeu}" property="path"/> 61 62 <html:image page="/resources/images/utils/delete.png" alt="delete" titleKey="data.upload.metadata.deleteJeu"/> … … 124 125 </logic:equal> 125 126 </logic:iterate> 126 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">127 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 127 128 <bean:define id="modify" value="true"/> 128 129 </logic:equal> … … 140 141 </nested:iterate> 141 142 142 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">143 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 143 144 144 145 <nested:define id="parent" property="nomCategorie"/> -
ether_megapoli/trunk/web/data/upload/arborescence.jsp
r261 r281 9 9 10 10 11 11 12 12 <div id="level2"> 13 13 <html:form action="/ConfirmDeletion"> 14 14 <html:img page="/resources/images/utils/folder.png" alt="folder"/> Nephelometer-ATR42 15 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">15 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 16 16 17 17 <html:hidden property="path" value="/Nephelometer-ATR42"/> … … 64 64 </logic:equal> 65 65 </logic:iterate> 66 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">66 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 67 67 <bean:define id="modify" value="true"/> 68 68 </logic:equal> … … 79 79 <html:form action="/ConfirmDeletion"> 80 80 <html:img page="/resources/images/utils/folder.png" alt="folder"/> Nephelometer-Piper 81 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">81 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 82 82 83 83 <html:hidden property="path" value="/Nephelometer-Piper"/> … … 130 130 </logic:equal> 131 131 </logic:iterate> 132 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">132 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 133 133 <bean:define id="modify" value="true"/> 134 134 </logic:equal> … … 145 145 <html:form action="/ConfirmDeletion"> 146 146 <html:img page="/resources/images/utils/folder.png" alt="folder"/> Grimm-Piper 147 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">147 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 148 148 149 149 <html:hidden property="path" value="/Grimm-Piper"/> … … 196 196 </logic:equal> 197 197 </logic:iterate> 198 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">198 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 199 199 <bean:define id="modify" value="true"/> 200 200 </logic:equal> … … 211 211 <html:form action="/ConfirmDeletion"> 212 212 <html:img page="/resources/images/utils/folder.png" alt="folder"/> PSAP-Piper 213 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">213 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 214 214 215 215 <html:hidden property="path" value="/PSAP-Piper"/> … … 262 262 </logic:equal> 263 263 </logic:iterate> 264 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">264 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 265 265 <bean:define id="modify" value="true"/> 266 266 </logic:equal> … … 277 277 <html:form action="/ConfirmDeletion"> 278 278 <html:img page="/resources/images/utils/folder.png" alt="folder"/> CPC-Piper 279 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">279 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 280 280 281 281 <html:hidden property="path" value="/CPC-Piper"/> … … 328 328 </logic:equal> 329 329 </logic:iterate> 330 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">330 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 331 331 <bean:define id="modify" value="true"/> 332 332 </logic:equal> … … 343 343 <html:form action="/ConfirmDeletion"> 344 344 <html:img page="/resources/images/utils/folder.png" alt="folder"/> SMPS-ATR42 345 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">345 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 346 346 347 347 <html:hidden property="path" value="/SMPS-ATR42"/> … … 394 394 </logic:equal> 395 395 </logic:iterate> 396 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">396 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 397 397 <bean:define id="modify" value="true"/> 398 398 </logic:equal> … … 409 409 <html:form action="/ConfirmDeletion"> 410 410 <html:img page="/resources/images/utils/folder.png" alt="folder"/> VSMPS-ATR42 411 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">411 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 412 412 413 413 <html:hidden property="path" value="/VSMPS-ATR42"/> … … 460 460 </logic:equal> 461 461 </logic:iterate> 462 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">462 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 463 463 <bean:define id="modify" value="true"/> 464 464 </logic:equal> … … 475 475 <html:form action="/ConfirmDeletion"> 476 476 <html:img page="/resources/images/utils/folder.png" alt="folder"/> PSAP-ATR42 477 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">477 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 478 478 479 479 <html:hidden property="path" value="/PSAP-ATR42"/> … … 526 526 </logic:equal> 527 527 </logic:iterate> 528 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">528 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 529 529 <bean:define id="modify" value="true"/> 530 530 </logic:equal> … … 541 541 <html:form action="/ConfirmDeletion"> 542 542 <html:img page="/resources/images/utils/folder.png" alt="folder"/> CPC-ATR42 543 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">543 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 544 544 545 545 <html:hidden property="path" value="/CPC-ATR42"/> … … 592 592 </logic:equal> 593 593 </logic:iterate> 594 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">594 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 595 595 <bean:define id="modify" value="true"/> 596 596 </logic:equal> … … 607 607 <html:form action="/ConfirmDeletion"> 608 608 <html:img page="/resources/images/utils/folder.png" alt="folder"/> MONA-ATR42 609 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">609 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 610 610 611 611 <html:hidden property="path" value="/MONA-ATR42"/> … … 658 658 </logic:equal> 659 659 </logic:iterate> 660 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">660 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 661 661 <bean:define id="modify" value="true"/> 662 662 </logic:equal> … … 673 673 <html:form action="/ConfirmDeletion"> 674 674 <html:img page="/resources/images/utils/folder.png" alt="folder"/> PTRMS-ATR42 675 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">675 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 676 676 677 677 <html:hidden property="path" value="/PTRMS-ATR42"/> … … 724 724 </logic:equal> 725 725 </logic:iterate> 726 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">726 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 727 727 <bean:define id="modify" value="true"/> 728 728 </logic:equal> … … 739 739 <html:form action="/ConfirmDeletion"> 740 740 <html:img page="/resources/images/utils/folder.png" alt="folder"/> ATR-flight data-O3-CO 741 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">741 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 742 742 743 743 <html:hidden property="path" value="/ATR-flight data-O3-CO"/> … … 790 790 </logic:equal> 791 791 </logic:iterate> 792 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">792 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 793 793 <bean:define id="modify" value="true"/> 794 794 </logic:equal> … … 806 806 <html:form action="/ConfirmDeletion"> 807 807 <html:img page="/resources/images/utils/folder.png" alt="folder"/> MILEAGE SIRTA 808 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">808 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 809 809 810 810 <html:hidden property="path" value="/MILEAGE SIRTA"/> … … 857 857 </logic:equal> 858 858 </logic:iterate> 859 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">859 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 860 860 <bean:define id="modify" value="true"/> 861 861 </logic:equal> … … 872 872 <html:form action="/ConfirmDeletion"> 873 873 <html:img page="/resources/images/utils/folder.png" alt="folder"/> AMS-SIRTA 874 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">874 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 875 875 876 876 <html:hidden property="path" value="/AMS-SIRTA"/> … … 923 923 </logic:equal> 924 924 </logic:iterate> 925 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">925 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 926 926 <bean:define id="modify" value="true"/> 927 927 </logic:equal> … … 938 938 <html:form action="/ConfirmDeletion"> 939 939 <html:img page="/resources/images/utils/folder.png" alt="folder"/> Nephelometer-SIRTA 940 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">940 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 941 941 942 942 <html:hidden property="path" value="/Nephelometer-SIRTA"/> … … 989 989 </logic:equal> 990 990 </logic:iterate> 991 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">991 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 992 992 <bean:define id="modify" value="true"/> 993 993 </logic:equal> … … 1004 1004 <html:form action="/ConfirmDeletion"> 1005 1005 <html:img page="/resources/images/utils/folder.png" alt="folder"/> HTDMA-VTDMA-SIRTA 1006 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1006 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1007 1007 1008 1008 <html:hidden property="path" value="/HTDMA-VTDMA-SIRTA"/> … … 1055 1055 </logic:equal> 1056 1056 </logic:iterate> 1057 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1057 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1058 1058 <bean:define id="modify" value="true"/> 1059 1059 </logic:equal> … … 1070 1070 <html:form action="/ConfirmDeletion"> 1071 1071 <html:img page="/resources/images/utils/folder.png" alt="folder"/> PILS-SIRTA 1072 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1072 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1073 1073 1074 1074 <html:hidden property="path" value="/PILS-SIRTA"/> … … 1121 1121 </logic:equal> 1122 1122 </logic:iterate> 1123 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1123 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1124 1124 <bean:define id="modify" value="true"/> 1125 1125 </logic:equal> … … 1136 1136 <html:form action="/ConfirmDeletion"> 1137 1137 <html:img page="/resources/images/utils/folder.png" alt="folder"/> Aethalometer-SIRTA 1138 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1138 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1139 1139 1140 1140 <html:hidden property="path" value="/Aethalometer-SIRTA"/> … … 1187 1187 </logic:equal> 1188 1188 </logic:iterate> 1189 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1189 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1190 1190 <bean:define id="modify" value="true"/> 1191 1191 </logic:equal> … … 1202 1202 <html:form action="/ConfirmDeletion"> 1203 1203 <html:img page="/resources/images/utils/folder.png" alt="folder"/> Aerosol chemical composition-SIRTA 1204 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1204 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1205 1205 1206 1206 <html:hidden property="path" value="/Aerosol chemical composition-SIRTA"/> … … 1253 1253 </logic:equal> 1254 1254 </logic:iterate> 1255 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1255 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1256 1256 <bean:define id="modify" value="true"/> 1257 1257 </logic:equal> … … 1268 1268 <html:form action="/ConfirmDeletion"> 1269 1269 <html:img page="/resources/images/utils/folder.png" alt="folder"/> CIMS-SIRTA 1270 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1270 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1271 1271 1272 1272 <html:hidden property="path" value="/CIMS-SIRTA"/> … … 1319 1319 </logic:equal> 1320 1320 </logic:iterate> 1321 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1321 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1322 1322 <bean:define id="modify" value="true"/> 1323 1323 </logic:equal> … … 1334 1334 <html:form action="/ConfirmDeletion"> 1335 1335 <html:img page="/resources/images/utils/folder.png" alt="folder"/> GAS-LSCE 1336 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1336 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1337 1337 1338 1338 <html:hidden property="path" value="/GAS-LSCE"/> … … 1385 1385 </logic:equal> 1386 1386 </logic:iterate> 1387 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1387 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1388 1388 <bean:define id="modify" value="true"/> 1389 1389 </logic:equal> … … 1400 1400 <html:form action="/ConfirmDeletion"> 1401 1401 <html:img page="/resources/images/utils/folder.png" alt="folder"/> Gas Gif-sur-Yvette 1402 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1402 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1403 1403 1404 1404 <html:hidden property="path" value="/Gas Gif-sur-Yvette"/> … … 1451 1451 </logic:equal> 1452 1452 </logic:iterate> 1453 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1453 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1454 1454 <bean:define id="modify" value="true"/> 1455 1455 </logic:equal> … … 1466 1466 <html:form action="/ConfirmDeletion"> 1467 1467 <html:img page="/resources/images/utils/folder.png" alt="folder"/> Gas Livry-Gargan 1468 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1468 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1469 1469 1470 1470 <html:hidden property="path" value="/Gas Livry-Gargan"/> … … 1517 1517 </logic:equal> 1518 1518 </logic:iterate> 1519 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1519 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1520 1520 <bean:define id="modify" value="true"/> 1521 1521 </logic:equal> … … 1532 1532 <html:form action="/ConfirmDeletion"> 1533 1533 <html:img page="/resources/images/utils/folder.png" alt="folder"/> weather Livry-Gargan 1534 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1534 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1535 1535 1536 1536 <html:hidden property="path" value="/weather Livry-Gargan"/> … … 1583 1583 </logic:equal> 1584 1584 </logic:iterate> 1585 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1585 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1586 1586 <bean:define id="modify" value="true"/> 1587 1587 </logic:equal> … … 1598 1598 <html:form action="/ConfirmDeletion"> 1599 1599 <html:img page="/resources/images/utils/folder.png" alt="folder"/> AMS Livry-Gargan 1600 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1600 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1601 1601 1602 1602 <html:hidden property="path" value="/AMS Livry-Gargan"/> … … 1649 1649 </logic:equal> 1650 1650 </logic:iterate> 1651 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1651 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1652 1652 <bean:define id="modify" value="true"/> 1653 1653 </logic:equal> … … 1664 1664 <html:form action="/ConfirmDeletion"> 1665 1665 <html:img page="/resources/images/utils/folder.png" alt="folder"/> BC + aerosol mass and properties Livry-Gargan 1666 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1666 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1667 1667 1668 1668 <html:hidden property="path" value="/BC + aerosol mass and properties Livry-Gargan"/> … … 1715 1715 </logic:equal> 1716 1716 </logic:iterate> 1717 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1717 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1718 1718 <bean:define id="modify" value="true"/> 1719 1719 </logic:equal> … … 1730 1730 <html:form action="/ConfirmDeletion"> 1731 1731 <html:img page="/resources/images/utils/folder.png" alt="folder"/> AMS-LHVP 1732 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1732 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1733 1733 1734 1734 <html:hidden property="path" value="/AMS-LHVP"/> … … 1781 1781 </logic:equal> 1782 1782 </logic:iterate> 1783 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1783 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1784 1784 <bean:define id="modify" value="true"/> 1785 1785 </logic:equal> … … 1796 1796 <html:form action="/ConfirmDeletion"> 1797 1797 <html:img page="/resources/images/utils/folder.png" alt="folder"/> PILS-IC-LHVP 1798 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1798 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1799 1799 1800 1800 <html:hidden property="path" value="/PILS-IC-LHVP"/> … … 1847 1847 </logic:equal> 1848 1848 </logic:iterate> 1849 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1849 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1850 1850 <bean:define id="modify" value="true"/> 1851 1851 </logic:equal> … … 1862 1862 <html:form action="/ConfirmDeletion"> 1863 1863 <html:img page="/resources/images/utils/folder.png" alt="folder"/> PILS-TOC-LHVP 1864 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1864 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1865 1865 1866 1866 <html:hidden property="path" value="/PILS-TOC-LHVP"/> … … 1913 1913 </logic:equal> 1914 1914 </logic:iterate> 1915 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1915 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1916 1916 <bean:define id="modify" value="true"/> 1917 1917 </logic:equal> … … 1928 1928 <html:form action="/ConfirmDeletion"> 1929 1929 <html:img page="/resources/images/utils/folder.png" alt="folder"/> TEOM-FDMS-LHVP 1930 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1930 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1931 1931 1932 1932 <html:hidden property="path" value="/TEOM-FDMS-LHVP"/> … … 1979 1979 </logic:equal> 1980 1980 </logic:iterate> 1981 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1981 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1982 1982 <bean:define id="modify" value="true"/> 1983 1983 </logic:equal> … … 1994 1994 <html:form action="/ConfirmDeletion"> 1995 1995 <html:img page="/resources/images/utils/folder.png" alt="folder"/> EC+BC-LSCE-LHVP 1996 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">1996 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 1997 1997 1998 1998 <html:hidden property="path" value="/EC+BC-LSCE-LHVP"/> … … 2045 2045 </logic:equal> 2046 2046 </logic:iterate> 2047 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2047 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2048 2048 <bean:define id="modify" value="true"/> 2049 2049 </logic:equal> … … 2060 2060 <html:form action="/ConfirmDeletion"> 2061 2061 <html:img page="/resources/images/utils/folder.png" alt="folder"/> Aerosol chemical composition-LHVP 2062 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2062 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2063 2063 2064 2064 <html:hidden property="path" value="/Aerosol chemical composition-LHVP"/> … … 2111 2111 </logic:equal> 2112 2112 </logic:iterate> 2113 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2113 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2114 2114 <bean:define id="modify" value="true"/> 2115 2115 </logic:equal> … … 2126 2126 <html:form action="/ConfirmDeletion"> 2127 2127 <html:img page="/resources/images/utils/folder.png" alt="folder"/> PTRMS-LHVP 2128 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2128 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2129 2129 2130 2130 <html:hidden property="path" value="/PTRMS-LHVP"/> … … 2177 2177 </logic:equal> 2178 2178 </logic:iterate> 2179 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2179 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2180 2180 <bean:define id="modify" value="true"/> 2181 2181 </logic:equal> … … 2192 2192 <html:form action="/ConfirmDeletion"> 2193 2193 <html:img page="/resources/images/utils/folder.png" alt="folder"/> CO-O3-NOx-LHVP 2194 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2194 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2195 2195 2196 2196 <html:hidden property="path" value="/CO-O3-NOx-LHVP"/> … … 2243 2243 </logic:equal> 2244 2244 </logic:iterate> 2245 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2245 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2246 2246 <bean:define id="modify" value="true"/> 2247 2247 </logic:equal> … … 2258 2258 <html:form action="/ConfirmDeletion"> 2259 2259 <html:img page="/resources/images/utils/folder.png" alt="folder"/> GC-FID-LHVP 2260 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2260 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2261 2261 2262 2262 <html:hidden property="path" value="/GC-FID-LHVP"/> … … 2309 2309 </logic:equal> 2310 2310 </logic:iterate> 2311 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2311 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2312 2312 <bean:define id="modify" value="true"/> 2313 2313 </logic:equal> … … 2324 2324 <html:form action="/ConfirmDeletion"> 2325 2325 <html:img page="/resources/images/utils/folder.png" alt="folder"/> VOC-cartridges-LHVP 2326 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2326 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2327 2327 2328 2328 <html:hidden property="path" value="/VOC-cartridges-LHVP"/> … … 2375 2375 </logic:equal> 2376 2376 </logic:iterate> 2377 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2377 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2378 2378 <bean:define id="modify" value="true"/> 2379 2379 </logic:equal> … … 2390 2390 <html:form action="/ConfirmDeletion"> 2391 2391 <html:img page="/resources/images/utils/folder.png" alt="folder"/> CO-CO2-Picarro-LHVP 2392 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2392 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2393 2393 2394 2394 <html:hidden property="path" value="/CO-CO2-Picarro-LHVP"/> … … 2441 2441 </logic:equal> 2442 2442 </logic:iterate> 2443 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2443 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2444 2444 <bean:define id="modify" value="true"/> 2445 2445 </logic:equal> … … 2456 2456 <html:form action="/ConfirmDeletion"> 2457 2457 <html:img page="/resources/images/utils/folder.png" alt="folder"/> GHG-flasks-LHVP 2458 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2458 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2459 2459 2460 2460 <html:hidden property="path" value="/GHG-flasks-LHVP"/> … … 2507 2507 </logic:equal> 2508 2508 </logic:iterate> 2509 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2509 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2510 2510 <bean:define id="modify" value="true"/> 2511 2511 </logic:equal> … … 2522 2522 <html:form action="/ConfirmDeletion"> 2523 2523 <html:img page="/resources/images/utils/folder.png" alt="folder"/> Nephelometer LHVP 2524 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2524 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2525 2525 2526 2526 <html:hidden property="path" value="/Nephelometer LHVP"/> … … 2573 2573 </logic:equal> 2574 2574 </logic:iterate> 2575 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2575 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2576 2576 <bean:define id="modify" value="true"/> 2577 2577 </logic:equal> … … 2588 2588 <html:form action="/ConfirmDeletion"> 2589 2589 <html:img page="/resources/images/utils/folder.png" alt="folder"/> VOC-cartridges-SIRTA 2590 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2590 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2591 2591 2592 2592 <html:hidden property="path" value="/VOC-cartridges-SIRTA"/> … … 2639 2639 </logic:equal> 2640 2640 </logic:iterate> 2641 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2641 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2642 2642 <bean:define id="modify" value="true"/> 2643 2643 </logic:equal> … … 2654 2654 <html:form action="/ConfirmDeletion"> 2655 2655 <html:img page="/resources/images/utils/folder.png" alt="folder"/> AMS PMF 2656 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2656 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2657 2657 2658 2658 <html:hidden property="path" value="/AMS PMF"/> … … 2705 2705 </logic:equal> 2706 2706 </logic:iterate> 2707 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2707 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2708 2708 <bean:define id="modify" value="true"/> 2709 2709 </logic:equal> … … 2720 2720 <html:form action="/ConfirmDeletion"> 2721 2721 <html:img page="/resources/images/utils/folder.png" alt="folder"/> METEO-SIRTA 2722 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2722 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2723 2723 2724 2724 <html:hidden property="path" value="/METEO-SIRTA"/> … … 2771 2771 </logic:equal> 2772 2772 </logic:iterate> 2773 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2773 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2774 2774 <bean:define id="modify" value="true"/> 2775 2775 </logic:equal> … … 2786 2786 <html:form action="/ConfirmDeletion"> 2787 2787 <html:img page="/resources/images/utils/folder.png" alt="folder"/> MLD-JUSSIEU 2788 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2788 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2789 2789 2790 2790 <html:hidden property="path" value="/MLD-JUSSIEU"/> … … 2837 2837 </logic:equal> 2838 2838 </logic:iterate> 2839 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2839 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2840 2840 <bean:define id="modify" value="true"/> 2841 2841 </logic:equal> … … 2852 2852 <html:form action="/ConfirmDeletion"> 2853 2853 <html:img page="/resources/images/utils/folder.png" alt="folder"/> LIDAR-LEOSPHERE 2854 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2854 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2855 2855 2856 2856 <html:hidden property="path" value="/LIDAR-LEOSPHERE"/> … … 2903 2903 </logic:equal> 2904 2904 </logic:iterate> 2905 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2905 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2906 2906 <bean:define id="modify" value="true"/> 2907 2907 </logic:equal> … … 2918 2918 <html:form action="/ConfirmDeletion"> 2919 2919 <html:img page="/resources/images/utils/folder.png" alt="folder"/> TDMPS-LHVP 2920 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2920 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2921 2921 2922 2922 <html:hidden property="path" value="/TDMPS-LHVP"/> … … 2969 2969 </logic:equal> 2970 2970 </logic:iterate> 2971 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2971 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2972 2972 <bean:define id="modify" value="true"/> 2973 2973 </logic:equal> … … 2984 2984 <html:form action="/ConfirmDeletion"> 2985 2985 <html:img page="/resources/images/utils/folder.png" alt="folder"/> SMPS-SIRTA 2986 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">2986 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 2987 2987 2988 2988 <html:hidden property="path" value="/SMPS-SIRTA"/> … … 3035 3035 </logic:equal> 3036 3036 </logic:iterate> 3037 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">3037 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 3038 3038 <bean:define id="modify" value="true"/> 3039 3039 </logic:equal> … … 3051 3051 <html:form action="/ConfirmDeletion"> 3052 3052 <html:img page="/resources/images/utils/folder.png" alt="folder"/> MAXDOAS 3053 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">3053 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 3054 3054 3055 3055 <html:hidden property="path" value="/MAXDOAS"/> … … 3102 3102 </logic:equal> 3103 3103 </logic:iterate> 3104 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">3104 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 3105 3105 <bean:define id="modify" value="true"/> 3106 3106 </logic:equal> … … 3117 3117 <html:form action="/ConfirmDeletion"> 3118 3118 <html:img page="/resources/images/utils/folder.png" alt="folder"/> MOLA 3119 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">3119 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 3120 3120 3121 3121 <html:hidden property="path" value="/MOLA"/> … … 3168 3168 </logic:equal> 3169 3169 </logic:iterate> 3170 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">3170 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 3171 3171 <bean:define id="modify" value="true"/> 3172 3172 </logic:equal> … … 3183 3183 <html:form action="/ConfirmDeletion"> 3184 3184 <html:img page="/resources/images/utils/folder.png" alt="folder"/> LIDAR-mobile 3185 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">3185 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 3186 3186 3187 3187 <html:hidden property="path" value="/LIDAR-mobile"/> … … 3234 3234 </logic:equal> 3235 3235 </logic:iterate> 3236 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">3236 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 3237 3237 <bean:define id="modify" value="true"/> 3238 3238 </logic:equal> -
ether_megapoli/trunk/web/data/upload/files.jsp
r263 r281 1 1 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%> 2 2 <%@ page import="com.medias.xml.hierarchie.Hierarchie"%> 3 <%@ page import="com.ether.user.UserRole" %> 3 4 4 5 <%@ page language="java" contentType="text/html; charset=UTF-8"%> … … 20 21 </logic:equal> 21 22 </logic:iterate> 22 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">23 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 23 24 <bean:define id="modify" value="true"/> 24 25 </logic:equal> … … 40 41 </logic:equal> 41 42 </logic:iterate> 42 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">43 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 43 44 <bean:define id="modify" value="true"/> 44 45 </logic:equal> … … 60 61 </logic:equal> 61 62 </logic:iterate> 62 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">63 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 63 64 <bean:define id="modify" value="true"/> 64 65 </logic:equal> … … 80 81 </logic:equal> 81 82 </logic:iterate> 82 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">83 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 83 84 <bean:define id="modify" value="true"/> 84 85 </logic:equal> … … 100 101 </logic:equal> 101 102 </logic:iterate> 102 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">103 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 103 104 <bean:define id="modify" value="true"/> 104 105 </logic:equal> … … 120 121 </logic:equal> 121 122 </logic:iterate> 122 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">123 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 123 124 <bean:define id="modify" value="true"/> 124 125 </logic:equal> … … 140 141 </logic:equal> 141 142 </logic:iterate> 142 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">143 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 143 144 <bean:define id="modify" value="true"/> 144 145 </logic:equal> … … 160 161 </logic:equal> 161 162 </logic:iterate> 162 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">163 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 163 164 <bean:define id="modify" value="true"/> 164 165 </logic:equal> … … 180 181 </logic:equal> 181 182 </logic:iterate> 182 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">183 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 183 184 <bean:define id="modify" value="true"/> 184 185 </logic:equal> … … 200 201 </logic:equal> 201 202 </logic:iterate> 202 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">203 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 203 204 <bean:define id="modify" value="true"/> 204 205 </logic:equal> … … 220 221 </logic:equal> 221 222 </logic:iterate> 222 <logic:equal name="SES_USER" property="roles" scope="session" value=" coordinateur">223 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 223 224 <bean:define id="modify" value="true"/> 224 225 </logic:equal> -
ether_megapoli/trunk/web/project/login.jsp
r259 r281 26 26 window.onload = function() 27 27 { 28 showLogin( "<bean:message key="data.authentification.text"/>" );28 getLoginModule().showLogin( "<bean:message key="data.authentification.text"/>" ); 29 29 } 30 30 </script> -
ether_megapoli/trunk/web/resources/js/classesForJQuery/LoginButton.js
r278 r281 116 116 { 117 117 var textLogin = this.jSONUser.name + " " + this.jSONUser.firstName; 118 if( this.jSONUser.role && "coordinateur" == this.jSONUser.role ) 118 // TODO : revoir les rÃŽles 119 if( this.jSONUser.role && "COORDINATOR" == this.jSONUser.role ) 119 120 textLogin += " (" + this.text1 + ")"; 120 121 -
ether_megapoli/trunk/web/resources/templates/template.jsp
r247 r281 1 1 <%@ page language="java" import="com.medias.Context" %> 2 <%@ page import="com.ether.user.UserRole" %> 2 3 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> 3 4 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> … … 274 275 <td height="40px" valign="middle" style="font-size: 13px; color: white"> 275 276 <bean:write name="SES_USER" property="prenom"/> <bean:write name="SES_USER" property="nom"/> 276 <logic:equal name="SES_USER" property="roles" value=" coordinateur">277 <logic:equal name="SES_USER" property="roles" value="<%=UserRole.COORDINATOR.name()%>"> 277 278 (<bean:message key="app.admin"/>) 278 279 </logic:equal> -
ether_megapoli/trunk/web/src/com/ether/ControllerEponge.java
r280 r281 6 6 import com.ether.user.UserRole; 7 7 import com.ether.user.UserState; 8 import com.medias.annuaire.Annuaire; 9 import com.medias.annuaire.Personne; 8 10 import com.medias.mail.Mail; 9 11 import com.medias.mail.MailFactory; … … 59 61 final JSONObject result = new JSONObject(); 60 62 63 // TODO : revoir doublon user/people, besoin du people pour les tests ds les .jsp 61 64 if( login != null && password != null ) 62 65 { … … 71 74 else 72 75 { 73 request.getSession().setAttribute( "SES_USER", user ); 74 jSONPeople.put( "name", user.getLastName() ); 75 jSONPeople.put( "firstName", user.getFirstName() ); 76 jSONPeople.put( "role", user.getRole().name() ); 76 final Annuaire annu = (Annuaire) getServletContext().getAttribute( "APP_ANNUAIRE" ); 77 final Personne people = annu.getPersonne( login, password ); 78 if( people == null ) 79 result.put( "errors", "errors.logon.notFound" ); 80 else 81 { 82 request.getSession().setAttribute( "SES_USER", people ); 83 jSONPeople.put( "name", user.getLastName() ); 84 jSONPeople.put( "firstName", user.getFirstName() ); 85 jSONPeople.put( "role", user.getRole().name() ); 86 } 77 87 } 78 88 }
Note: See TracChangeset
for help on using the changeset viewer.