From dca233da539bed1239bde6db6b8ada05a080e34a Mon Sep 17 00:00:00 2001 From: Denis Smirnov Date: Fri, 25 Oct 2013 18:48:22 +0400 Subject: [PATCH] =?UTF-8?q?=D0=92=20=D0=BF=D0=BE=D0=BB=D1=8F=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BB=D0=BB=D0=B5=D0=BA=D1=86=D0=B8=D0=B8=20devices=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F=D1=8E=D1=82=D1=81?= =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=8F=20=D0=B8=D0=BC=D1=8F=20=D0=B8?= =?UTF-8?q?=20=D1=84=D0=B0=D0=BC=D0=B8=D0=BB=D0=B8=D1=8F=20=D0=B2=D0=BB?= =?UTF-8?q?=D0=B0=D0=B4=D0=B5=D0=BB=D1=8C=D1=86=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front-end/meteor-device-spy/client/client.js | 2 +- front-end/meteor-device-spy/server/checkindevice_api.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/front-end/meteor-device-spy/client/client.js b/front-end/meteor-device-spy/client/client.js index 5f03a4d..4999756 100644 --- a/front-end/meteor-device-spy/client/client.js +++ b/front-end/meteor-device-spy/client/client.js @@ -8,7 +8,7 @@ Template.devices_list.device = function () { Template.devices_list.get_name_by_id = function () { var owner = Users.findOne({_id: this.owner_id}); if (!owner) return "Не известно"; - return owner.name + " " + owner.surname; + return this.owner_name + " " + this.owner_surname; }; Template.devices_list.get_checkin_date = function () { diff --git a/front-end/meteor-device-spy/server/checkindevice_api.js b/front-end/meteor-device-spy/server/checkindevice_api.js index 768f4d3..83b475e 100644 --- a/front-end/meteor-device-spy/server/checkindevice_api.js +++ b/front-end/meteor-device-spy/server/checkindevice_api.js @@ -17,7 +17,10 @@ Meteor.startup(function () { console.log("-------- Устройство: ", device.name); - Devices.update(device._id, {$set: {checkin_date: new Date(), owner_id: user._id}}); + Devices.update(device._id, {$set: {checkin_date: new Date(), + owner_id: user._id, + owner_name: user.name, + owner_surname: user.surname}}); }); });