From fd4a1b9ba3229cc0414256aed7220eafe934c12c Mon Sep 17 00:00:00 2001
From: gakin <gakin>
Date: Thu, 30 Jul 2015 08:31:21 +0000
Subject: [PATCH] SSDM-2161 ELN: change the way codes are automatically
generated
SVN: 34395
---
.../html/js/views/SampleForm/widgets/CommentsController.js | 2 +-
.../eln-lims/html/js/views/SampleForm/widgets/CommentsView.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/CommentsController.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/CommentsController.js
index 251b54f7894..c542023a4bf 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/CommentsController.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/CommentsController.js
@@ -40,7 +40,7 @@ function CommentsController(entity, mode, form) {
this.addNewComment = function(newComment) {
//New Data
- var timestamp = Math.round(new Date().getTime() / 1000);
+ var timestamp = Math.round(new Date().getTime());
var userId = mainController.serverFacade.getUserId();
//Update Model
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/CommentsView.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/CommentsView.js
index 3d446922646..e66af2582e1 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/CommentsView.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/CommentsView.js
@@ -52,7 +52,7 @@ function CommentsView(commentsController, commentsModel) {
$buttonDelete = $("<a>", {"class" : "btn btn-default"});
$buttonDelete.append($("<span>", { "class" : "glyphicon glyphicon-minus-sign"}));
}
- var date = Util.getFormatedDate(new Date(parseInt(dateValue) * 1000));
+ var date = Util.getFormatedDate(new Date(parseInt(dateValue)));
var deleteEnabled = false;
var $sufixComponent = null;
--
GitLab