[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets OrderAction.java, 1.22, 1.23 OrderFullfillAction.java, 1.18, 1.19

[Stefan K. <sh...@us...>]

Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3312/src/java/org/openscience/nmrshiftdb/modules/actions/portlets

Modified Files:
	OrderAction.java OrderFullfillAction.java 
Log Message:
admin can view and delete users from his labgroup


Index: OrderAction.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderAction.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** OrderAction.java	19 Sep 2006 14:28:56 -0000	1.22
--- OrderAction.java	20 Sep 2006 11:35:46 -0000	1.23
***************
*** 22,25 ****
--- 22,26 ----
  import org.openscience.nmrshiftdb.om.DBConditionPeer;
  import org.openscience.nmrshiftdb.om.DBRawFile;
+ import org.openscience.nmrshiftdb.om.DBRawFileDBSpectrumPeer;
  import org.openscience.nmrshiftdb.om.DBRawFilePeer;
  import org.openscience.nmrshiftdb.om.DBSample;
***************
*** 298,305 ****
--- 299,315 ----
          Criteria crit=new Criteria();
          crit.add(DBSamplePeer.SAMPLE_ID,data.getParameters().get("id"));
+         Vector v=DBRawFilePeer.doSelect(crit);
+         for(int i=0;i<v.size();i++){
+         	DBRawFile rf=(DBRawFile)v.get(i);
+             Criteria crit2=new Criteria();
+             crit2.add(DBRawFilePeer.RAW_FILE_ID,rf.getRawFileId());
+             DBRawFileDBSpectrumPeer.doDelete(crit);        	
+         }
+         DBRawFilePeer.doDelete(crit);
          DBSamplePeer.doDelete(crit);
          buildOrderContext(context,data);
        }
      }catch(Exception ex){
+     	ex.printStackTrace();
        GeneralUtils.logError(ex,"guestbook/doentry",data,true);
      }

Index: OrderFullfillAction.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/modules/actions/portlets/OrderFullfillAction.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** OrderFullfillAction.java	15 Sep 2006 11:57:00 -0000	1.18
--- OrderFullfillAction.java	20 Sep 2006 11:35:46 -0000	1.19
***************
*** 11,15 ****
--- 11,18 ----
  import org.apache.jetspeed.modules.actions.portlets.VelocityPortletAction;
  import org.apache.jetspeed.portal.portlets.VelocityPortlet;
+ import org.apache.jetspeed.services.JetspeedSecurity;
  import org.apache.turbine.om.NumberKey;
+ import org.apache.turbine.om.peer.BasePeer;
+ import org.apache.turbine.om.security.User;
  import org.apache.turbine.util.RunData;
  import org.apache.turbine.util.db.Criteria;
***************
*** 132,135 ****
--- 135,155 ----
    }
    
+   public void doSubmitdelete(RunData data, Context context) throws Exception {
+ 	    try{
+ 	    	if(data.getParameters().getString("deleteconfirm").equals("true")){
+ 	    		String sql="update TURBINE_USER set LABGROUP=0 where LOGIN_NAME='"+data.getParameters().getString("username")+"'";
+ 	    		BasePeer.executeStatement(sql);
+ 	    		if(NmrshiftdbUserPeer.getByName(data.getParameters().getString("username")).getDBSpectrums().size()==0.){
+ 	            	User user = JetspeedSecurity.getUser(data.getParameters().getString("username"));
+ 	            	JetspeedSecurity.removeUser(user, data);
+ 	    		}
+ 			    buildOrderContext(context,data);
+ 	    	}
+ 	    }
+ 	    catch(Exception ex){
+ 	    	ex.printStackTrace();
+ 	      GeneralUtils.logError(ex,"guestbook/doentry",data,true);
+ 	    }
+ 	}
    
      /**