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";