[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets Or
Brought to you by:
steinbeck
|
From: Stefan K. <sh...@us...> - 2006-11-10 14:14:13
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18623/src/java/org/openscience/nmrshiftdb/modules/actions/portlets Modified Files: OrderAction.java Log Message: this should include the possibility of external link for submitting to lab system, but this is not working and I do not know why Index: OrderAction.java =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderAction.java,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** OrderAction.java 9 Nov 2006 14:43:42 -0000 1.38 --- OrderAction.java 10 Nov 2006 14:14:05 -0000 1.39 *************** *** 84,116 **** try{ context.put("ordertype",OrderAction.WORKER); ! if(data.getParameters().getString("nmrshiftdbaction","none").equals("submitfromlabjournal")){ ! String username = data.getParameters().get("username"); ! String password = data.getParameters().get("password"); ! User user = null; ! // Authenticate the user and get the object. ! user = TurbineSecurity.getAuthenticatedUser(username, password); ! ! ! // Store the user object. ! data.setUser(user); ! ! // Mark the user as being logged in. ! user.setHasLoggedIn(new Boolean(true)); ! ! // Set the last_login date in the database. ! user.updateLastLogin(); ! ! // This only happens if the user is valid; otherwise, we ! // will get a valueBound in the User object when we don't ! // want to because the username is not set yet. Save the ! // User object into the session. ! data.save(); ! //this.doSubmitorder(data, context); ! ! data.getResponse().sendError(302,"www.web.de"); ! ! }else{ ! buildOrderContext(context,data); ! } } catch(Exception ex){ --- 84,88 ---- try{ context.put("ordertype",OrderAction.WORKER); ! buildOrderContext(context,data); } catch(Exception ex){ *************** *** 429,433 **** message+=" "; } if(data.getParameters().getString("nmrshiftdbaction","none").equals("submitfromlabjournal")){ ! //this means the link from the lab journal system is used message+=" "; }else{ --- 401,405 ---- message+=" "; } if(data.getParameters().getString("nmrshiftdbaction","none").equals("submitfromlabjournal")){ ! //this means the link from the lab journal system is used, so we do not want immediate submit message+=" "; }else{ |