diff --git a/lib/units/groups-engine/watchers/devices.js b/lib/units/groups-engine/watchers/devices.js index 608b4434..b3100a28 100644 --- a/lib/units/groups-engine/watchers/devices.js +++ b/lib/units/groups-engine/watchers/devices.js @@ -127,6 +127,7 @@ module.exports = function(push, pushdev, channelRouter) { , 'cpuPlatform' , 'openGLESVersion' , {phone: ['imei']} + , 'marketName' ) .changes(), function(err, cursor) { if (err) { diff --git a/lib/util/fakedevice.js b/lib/util/fakedevice.js index 04a299d9..6a6de91f 100644 --- a/lib/util/fakedevice.js +++ b/lib/util/fakedevice.js @@ -53,6 +53,7 @@ module.exports.generate = function(wantedModel) { , product: model , cpuPlatform: 'msm8996' , openGLESVersion: '3.1' + , marketName: 'Bar F9+' }) }) .then(function() { diff --git a/lib/wire/wire.proto b/lib/wire/wire.proto index 17c2ca1f..3bc8cdf5 100644 --- a/lib/wire/wire.proto +++ b/lib/wire/wire.proto @@ -176,6 +176,7 @@ message DeviceField { optional DevicePhoneField phone = 12; optional DeviceProviderField provider = 13; optional DeviceGroupField group = 14; + optional string marketName = 15; } message DeviceChangeMessage { diff --git a/res/app/group-list/group-list-controller.js b/res/app/group-list/group-list-controller.js index 63c92b00..d86315df 100644 --- a/res/app/group-list/group-list-controller.js +++ b/res/app/group-list/group-list-controller.js @@ -30,6 +30,7 @@ module.exports = function GroupListCtrl( 'serial,' + 'version,' + 'manufacturer,' + + 'marketName,' + 'sdk,' + 'display.width,' + 'display.height,' + diff --git a/res/app/group-list/groups/groups.pug b/res/app/group-list/groups/groups.pug index f985b25a..ad18cf0d 100644 --- a/res/app/group-list/groups/groups.pug +++ b/res/app/group-list/groups/groups.pug @@ -94,7 +94,7 @@ .device-line i.fa.fa-mobile.group-device-icon .group-device-details.selectable - a.group-device-name(ng-bind-template="{{device.manufacturer + ' ' + device.model}}") + a.group-device-name(ng-bind-template="{{device.manufacturer + ' ' + device.model + ' (' + device.marketName + ')'}}") .group-device-id span(translate) Serial span(ng-bind-template="{{::': ' + device.serial + ' - '}}") diff --git a/res/app/settings/devices/devices-controller.js b/res/app/settings/devices/devices-controller.js index 63822ff3..0d539a0c 100644 --- a/res/app/settings/devices/devices-controller.js +++ b/res/app/settings/devices/devices-controller.js @@ -24,6 +24,7 @@ module.exports = function DevicesCtrl( 'abi,' + 'cpuPlatform,' + 'openGLESVersion,' + + 'marketName,' + 'phone.imei,' + 'provider.name,' + 'group.originName' diff --git a/res/app/settings/devices/devices.pug b/res/app/settings/devices/devices.pug index 59c43d1d..a7f90f4d 100644 --- a/res/app/settings/devices/devices.pug +++ b/res/app/settings/devices/devices.pug @@ -115,7 +115,7 @@ .device-line.device-actions i.fa.fa-mobile.fa-2x.fa-fw.device-list-icon .device-list-details.selectable - .device-list-name(ng-bind-template="{{device.manufacturer + ' ' + device.model}}") + .device-list-name(ng-bind-template="{{device.manufacturer + ' ' + device.model + ' (' + device.marketName + ')'}}") .device-list-id span(translate) Serial span(ng-bind-template="{{::': ' + device.serial + ' - '}}") diff --git a/res/app/settings/groups/devices/devices.pug b/res/app/settings/groups/devices/devices.pug index 4bffbfd0..0a39d331 100644 --- a/res/app/settings/groups/devices/devices.pug +++ b/res/app/settings/groups/devices/devices.pug @@ -91,9 +91,10 @@ li.list-group-item.groups-list td(ng-if='groupDeviceData.columns[8].selected') {{device.abi}} td(ng-if='groupDeviceData.columns[9].selected') {{device.cpuPlatform}} td(ng-if='groupDeviceData.columns[10].selected') {{device.openGLESVersion}} - td(ng-if='groupDeviceData.columns[11].selected') {{device.phone.imei}} - td(ng-if='groupDeviceData.columns[12].selected') {{device.provider.name}} - td(ng-if='groupDeviceData.columns[13].selected') {{device.group.originName}} + td(ng-if='groupDeviceData.columns[11].selected') {{device.marketName}} + td(ng-if='groupDeviceData.columns[12].selected') {{device.phone.imei}} + td(ng-if='groupDeviceData.columns[13].selected') {{device.provider.name}} + td(ng-if='groupDeviceData.columns[14].selected') {{device.group.originName}} .panel.panel-default .panel-heading.text-center @@ -190,6 +191,7 @@ li.list-group-item.groups-list td(ng-if='deviceData.columns[8].selected') {{device.abi}} td(ng-if='deviceData.columns[9].selected') {{device.cpuPlatform}} td(ng-if='deviceData.columns[10].selected') {{device.openGLESVersion}} - td(ng-if='deviceData.columns[11].selected') {{device.phone.imei}} - td(ng-if='deviceData.columns[12].selected') {{device.provider.name}} - td(ng-if='deviceData.columns[13].selected') {{device.group.originName}} + td(ng-if='deviceData.columns[11].selected') {{device.marketName}} + td(ng-if='deviceData.columns[12].selected') {{device.phone.imei}} + td(ng-if='deviceData.columns[13].selected') {{device.provider.name}} + td(ng-if='deviceData.columns[14].selected') {{device.group.originName}} diff --git a/res/app/settings/groups/groups-controller.js b/res/app/settings/groups/groups-controller.js index 204648b2..3dbee0f5 100644 --- a/res/app/settings/groups/groups-controller.js +++ b/res/app/settings/groups/groups-controller.js @@ -37,6 +37,7 @@ module.exports = function GroupsCtrl( 'abi,' + 'cpuPlatform,' + 'openGLESVersion,' + + 'marketName,' + 'phone.imei,' + 'provider.name,' + 'group.originName' @@ -384,6 +385,7 @@ module.exports = function GroupsCtrl( , {name: 'ABI', property: 'abi'} , {name: 'CPU Platform', property: 'cpuPlatform'} , {name: 'OpenGL ES version', property: 'openGLESVersion'} + , {name: 'Market name', property: 'marketName'} , {name: 'Phone IMEI', property: 'phone.imei'} , {name: 'Location', property: 'provider.name'} , {name: 'Group Origin', property: 'group.originName'} @@ -401,6 +403,7 @@ module.exports = function GroupsCtrl( , {name: 'ABI', selected: false, sort: 'none'} , {name: 'CPU Platform', selected: false, sort: 'none'} , {name: 'OpenGL ES version', selected: false, sort: 'none'} + , {name: 'Market name', selected: true, sort: 'none'} , {name: 'Phone IMEI', selected: false, sort: 'none'} , {name: 'Location', selected: true, sort: 'none'} , {name: 'Group Origin', selected: true, sort: 'none'}