merging client_2021 into master

CBIIT · Jul 27, 2022 · 51f5fa9 · 51f5fa9
1 parent a1c19da
commit 51f5fa9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/software/cananolab-client-new/src/app/cananolab-client/cananolab-client.component.html b/software/cananolab-client-new/src/app/cananolab-client/cananolab-client.component.html
@@ -105,7 +105,7 @@
         </tr>
         <tr *ngIf="!print">
             <td colspan="2" class="footer white release">
-                caNanoLab Release 3.0 Build cananolab-3.0.0-it6
+                caNanoLab Release 3.0 Build cananolab-3.0.0-it7
             </td>
         </tr>
     </table>

diff --git a/...n-display/samples/characterization/editcharacterization/editcharacterization.component.ts b/...n-display/samples/characterization/editcharacterization/editcharacterization.component.ts
@@ -372,7 +372,7 @@ export class EditcharacterizationComponent implements OnInit {
     };
 
     editFileForm(file,index) {
-        this.currentFile=JSON.parse(JSON.stringify(file));
+        this.currentFile=file;
         this.fileIndex=index;
     };