From 88cd019a4cf053f0fcb7573c84447bdde9901cc0 Mon Sep 17 00:00:00 2001 From: Denis Smirnov Date: Wed, 23 Oct 2013 17:19:19 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BB=D0=BB=D0=B5=D0=BA=D1=86=D0=B8=D0=B8=20devices.?= 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/html/table.html | 2 +- front-end/meteor-device-spy/server/rest_api.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/front-end/meteor-device-spy/client/client.js b/front-end/meteor-device-spy/client/client.js index 4d3d2ea..d7ae321 100644 --- a/front-end/meteor-device-spy/client/client.js +++ b/front-end/meteor-device-spy/client/client.js @@ -2,7 +2,7 @@ Session.set("session_devices_type", "iPhone/iPod"); // ---------- Template.devices_list.device = function () { - return Devices.find({os_type : Session.get("session_devices_type")}, {sort: {checkin_date: -1}}); + return Devices.find({device_type : Session.get("session_devices_type")}, {sort: {checkin_date: -1}}); }; Template.devices_list.get_name_by_id = function () { diff --git a/front-end/meteor-device-spy/html/table.html b/front-end/meteor-device-spy/html/table.html index a01f802..2c11437 100644 --- a/front-end/meteor-device-spy/html/table.html +++ b/front-end/meteor-device-spy/html/table.html @@ -17,7 +17,7 @@
- {{type}} + {{name}}
{{os_type}} {{os_version}} {{screen_width}}x{{screen_height}} diff --git a/front-end/meteor-device-spy/server/rest_api.js b/front-end/meteor-device-spy/server/rest_api.js index 01e0999..cab1cf1 100644 --- a/front-end/meteor-device-spy/server/rest_api.js +++ b/front-end/meteor-device-spy/server/rest_api.js @@ -24,7 +24,7 @@ Meteor.startup(function () { if (!device) return "Can't find such device-ID"; - console.log("-------- Устройство: ", device.type); + console.log("-------- Устройство: ", device.name); var checkinDate = GetCurrentDateAndTime (); Devices.update(device._id, {$set: {checkin_date: checkinDate, owner_id: user._id}});