From e5f668ff9b493156f37555ffb85ac2e566bb26d9 Mon Sep 17 00:00:00 2001 From: Denis Smirnov Date: Wed, 23 Oct 2013 13:28:13 +0400 Subject: [PATCH] =?UTF-8?q?MAC-=D0=B0=D0=B4=D1=80=D0=B5=D1=81=20=D0=B2=20a?= =?UTF-8?q?pi=20=D0=B8=D1=89=D0=B5=D1=82=D1=81=D1=8F=20=D1=82=D0=B5=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D0=B2=20=D0=B2=D0=B5=D1=80=D1=85=D0=BD?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=B8=20=D0=BD=D0=B8=D0=B6=D0=BD=D0=B5=D0=BC=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B5.?= 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/rest_api.js | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/front-end/meteor-device-spy/client/client.js b/front-end/meteor-device-spy/client/client.js index 0a48af8..4d3d2ea 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.sername; + return owner.name + " " + owner.surname; }; // ---------- diff --git a/front-end/meteor-device-spy/server/rest_api.js b/front-end/meteor-device-spy/server/rest_api.js index 3fccdb6..7bdbf3e 100644 --- a/front-end/meteor-device-spy/server/rest_api.js +++ b/front-end/meteor-device-spy/server/rest_api.js @@ -13,9 +13,18 @@ Meteor.startup(function () { var param = this.params.param; var mac = param.substring(0, 12); var uid = param.substring(13); - + + mac = mac.toUpperCase(); var user = Users.findOne({MAC: mac}); - if (!user) return "Can't find such MAC-address in db"; + if (!user) { + + mac = mac.toLowerCase(); + user = Users.findOne({MAC: mac}); + if (!user) + return res+" Can't find such MAC-address in db"; + return "Can't find such MAC-address in db"; + + } var d = Devices.findOne({id: uid}); if (!d) return "Can't find such device";