TouchInstinct
/
DeviceTracker
303
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAC-адрес в api ищется теперь в верхнем и нижнем регистре.

This commit is contained in:
Denis Smirnov 2013-10-23 13:28:13 +04:00
parent cce8acc54a
commit e5f668ff9b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front-end/meteor-device-spy/client/client.js
View File

@ -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;
};
// ----------

11
front-end/meteor-device-spy/server/rest_api.js
View File

@ -14,8 +14,17 @@ Meteor.startup(function () {
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";