Changeset 504 for tapas/web/src
- Timestamp:
- 05/11/12 12:34:56 (12 years ago)
- Location:
- tapas/web/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
tapas/web/src/com/ether/Controller.java
r496 r504 11 11 import org.apache.commons.logging.Log; 12 12 import org.apache.commons.logging.LogFactory; 13 import org.jetbrains.annotations.NotNull; 13 14 14 15 import java.io.FileInputStream; … … 36 37 * @throws WebException 37 38 */ 38 @ControllerMethod(view = VIEW_FORM_TAPAS, loginMandatory = false, defaultView = VIEW_INDEX)39 @ControllerMethod(view = VIEW_FORM_TAPAS, loginMandatory = true, defaultView = VIEW_INDEX) 39 40 public JSONObject viewForm() 40 41 throws WebException … … 72 73 * @throws WebException 73 74 */ 74 //@ControllerMethod(jsonResult = true, userMandatory = true, defaultView = VIEW_INDEX)75 @ControllerMethod(jsonResult = true, userMandatory = false, defaultView = VIEW_INDEX)76 //public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas, @NotNull final User user )77 public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas )75 @ControllerMethod(jsonResult = true, userMandatory = true, defaultView = VIEW_INDEX) 76 //@ControllerMethod(jsonResult = true, userMandatory = false, defaultView = VIEW_INDEX) 77 public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas, @NotNull final User user ) 78 //public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas ) 78 79 throws WebException 79 80 { 80 81 81 82 /***********/ 82 final User user = new User();83 /* final User user = new User(); 83 84 user.setId( 12 ); 84 85 user.setLastName( "tamere" ); 85 86 user.setEmail( "rbopipsl@ipsl.jussieu.fr" ); 86 87 user.setCreationDate( new Date() ); 87 user.setPassword( "pif" ); 88 user.setPassword( "pif" );*/ 88 89 /******/ 89 90 … … 101 102 } 102 103 103 //TODO recuperer le USER via ControllerEther104 105 104 // creation fichier requete xml 106 105 try … … 126 125 try 127 126 { 128 getTapasService().execAppelQSub( "popo", user, prop );127 getTapasService().execAppelQSub( javaTapas.getId(), user, prop ); 129 128 } 130 129 catch( ServiceException e ) -
tapas/web/src/messages_en.properties
r490 r504 31 31 text.badvalue=bad value 32 32 text.toselect=must be selected 33 text.erreur.saisie=Error form request 33 34 34 label.delButton=CANCEL 35 35 36 36 37 … … 51 52 label.backoffice=Backoffice 52 53 label.form=Request form 54 label.confirm.del=Do you really want to remove this request ? 55 label.success=Your request was taken into account. You will receive by email the access result files. 53 56 54 57 label.role.administrator=Administrateur … … 58 61 59 62 label.submitButton=EXECUTE 60 label.addButton=ADD REQUEST 61 label.confirm=ARE YOU SURE YOU WANT TO SEND THIS REQUEST ? 63 label.addButton=+ 64 label.delButton=x 65 label.title.add=ADD A NEW REQUEST 66 label.title.del=REMOVE CURRENT REQUEST 67 label.confirm=SEND THE REQUEST PROCESSING ? 62 68 label.requete=Request 63 69 -
tapas/web/src/messages_fr.properties
r490 r504 26 26 label.observatory=Observatoire 27 27 label.preferences=Préférences 28 label.confirm.del=Voulez-vous vraiment supprimer cette requête ? 29 label.success=Votre requête a été prise en compte. Vous allez recevoir par email l'accés aux fichiers résultats. 28 30 29 label.delButton=ANNULER30 31 31 32 text.validnum=doit être numérique … … 34 35 text.NONE=Aucune 35 36 text.toselect=à sélectionner 37 text.erreur.saisie=Erreur saisie requête 36 38 37 39 … … 56 58 label.role.user=User 57 59 58 label.confirm= CONFIRMEZ-VOUS L'ENREGISTREMENT DE CETTE REQUETE ?60 label.confirm=ENVOYER LA DEMANDE ? 59 61 60 62 error.ERROR_JSON_TAPAS_IS_NULL=Erreur de création du formulaire Tapas 61 63 62 64 label.submitButton=EXECUTER 63 label.addButton=ENREGISTRER 65 label.addButton=+ 66 label.delButton=x 67 label.title.add=AJOUTER UNE NOUVELLE REQUETE 68 label.title.del=SUPPRIMER LA REQUETE COURANTE 64 69 label.requete=Requete 65 70
Note: See TracChangeset
for help on using the changeset viewer.