merged master into devel

htgt · Feb 18, 2014 · f050612 · f050612
2 parents fa7598d + 4437a8d
commit f050612
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,10 @@
 {{$NEXT}}
 
+0.009     2013-05-31 07:26:05 Europe/London
+
+    Add load crispr data task.
+    Add create crispr plate task.
+
 0.008     2013-05-22 13:35:12 Europe/London
     Updated create project command to add species and create Cre Knockin projects.
 

diff --git a/lib/LIMS2/Task/General/CreateDesignPlate.pm b/lib/LIMS2/Task/General/CreateDesignPlate.pm
@@ -138,7 +138,8 @@ sub build_design_plate_data {
 sub _build_well_data {
     my ( $self, $data ) = @_;
 
-    my $design = $self->model->retrieve_design( { id => $data->{design_id} } );
+    my $design = $self->model->c_retrieve_design( { id => $data->{design_id} } );
+    my $bac_data = $self->_build_bac_data( $design );
 
     my %well_data;
     $well_data{well_name}    = $data->{well_name};

diff --git a/lib/LIMS2/Task/YAMLDataLoader/LoadDesigns.pm b/lib/LIMS2/Task/YAMLDataLoader/LoadDesigns.pm
@@ -17,7 +17,7 @@ override abstract => sub {
 override create => sub {
     my ( $self, $datum ) = @_;
 
-    $self->model->create_design( $datum );
+    $self->model->c_create_design( $datum );
 };
 
 override record_key => sub {