ruhnet
/
monster-ui-voip
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

UI-948: Disabled pagination on API requests that the front-end make to render the SmartPBX, it was confusing the user who would think its numbers disappear and things like this...

4.3
Jean-Roch Maitre 11 years ago
parent
bea57d91e3
commit
c9b5b66e4d
5 changed files with 121 additions and 31 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +16
    -4
      submodules/devices/devices.js
  2. +24
    -6
      submodules/groups/groups.js
  3. +21
    -5
      submodules/myOffice/myOffice.js
  4. +22
    -4
      submodules/strategy/strategy.js
  5. +38
    -12
      submodules/users/users.js

+ 16
- 4
submodules/devices/devices.js View File

@ -803,7 +803,10 @@ define(function(require){
self.callApi({
resource: 'numbers.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data) {
var e911Numbers = [];
@ -934,7 +937,10 @@ define(function(require){
self.callApi({
resource: 'user.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(dataUsers) {
callback && callback(null, dataUsers.data);
@ -945,7 +951,10 @@ define(function(require){
self.callApi({
resource: 'device.getStatus',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(dataStatus) {
callback && callback(null, dataStatus.data);
@ -956,7 +965,10 @@ define(function(require){
self.callApi({
resource: 'device.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(dataDevices) {
callback(null, dataDevices.data);


+ 24
- 6
submodules/groups/groups.js View File

@ -1148,7 +1148,10 @@ define(function(require){
self.callApi({
resource: 'user.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data) {
callback && callback(data.data);
@ -1309,7 +1312,10 @@ define(function(require){
self.callApi({
resource: 'numbers.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(numbers) {
callbackParallel && callbackParallel(null, numbers.data);
@ -1457,7 +1463,10 @@ define(function(require){
self.callApi({
resource: 'callflow.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(callflows) {
callback && callback(callflows.data);
@ -1472,7 +1481,10 @@ define(function(require){
resource: 'media.list',
data: {
accountId: self.accountId,
filters: { 'key_missing':'type' }
filters: {
'paginate': 'false',
'key_missing':'type'
}
},
success: function(medias) {
callback && callback(medias.data);
@ -1486,7 +1498,10 @@ define(function(require){
self.callApi({
resource: 'voicemail.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(medias) {
callback && callback(medias.data);
@ -1828,7 +1843,10 @@ define(function(require){
self.callApi({
resource: 'group.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(dataGroups) {
callback(null, dataGroups.data);


+ 21
- 5
submodules/myOffice/myOffice.js View File

@ -132,7 +132,10 @@ define(function(require){
self.callApi({
resource: 'user.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(dataUsers) {
parallelCallback && parallelCallback(null, dataUsers.data);
@ -143,7 +146,10 @@ define(function(require){
self.callApi({
resource: 'device.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data) {
parallelCallback && parallelCallback(null, data.data);
@ -154,7 +160,10 @@ define(function(require){
self.callApi({
resource: 'device.getStatus',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data) {
parallelCallback && parallelCallback(null, data.data);
@ -165,7 +174,10 @@ define(function(require){
self.callApi({
resource: 'numbers.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data) {
parallelCallback && parallelCallback(null, data.data.numbers);
@ -181,7 +193,10 @@ define(function(require){
self.callApi({
resource: 'channel.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data) {
parallelCallback && parallelCallback(null, data.data);
@ -194,6 +209,7 @@ define(function(require){
data: {
filters: {
has_type: 'type',
paginate: 'false'
},
accountId: self.accountId
},


+ 22
- 4
submodules/strategy/strategy.js View File

@ -2043,7 +2043,10 @@ define(function(require){
self.callApi({
resource: 'user.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data, status) {
_callback(null, data.data);
@ -2069,7 +2072,10 @@ define(function(require){
self.callApi({
resource: 'group.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data, status) {
_callback(null, data.data);
@ -2095,7 +2101,10 @@ define(function(require){
self.callApi({
resource: 'device.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data, status) {
_callback(null, data.data);
@ -2147,6 +2156,9 @@ define(function(require){
resource: 'voicemail.list',
data: {
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data, status) {
data.data.sort(function(a,b) { return (a.name.toLowerCase() > b.name.toLowerCase()); });
@ -2161,6 +2173,9 @@ define(function(require){
resource: 'numbers.list',
data: {
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data, status) {
callback(data.data.numbers);
@ -2230,7 +2245,10 @@ define(function(require){
self.callApi({
resource: 'callflow.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(callflowData) {
callback && callback(callflowData.data);


+ 38
- 12
submodules/users/users.js View File

@ -2403,7 +2403,10 @@ define(function(require){
self.callApi({
resource: 'device.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data) {
callback && callback(data.data);
@ -2956,7 +2959,10 @@ define(function(require){
self.callApi({
resource: 'directory.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data) {
callback && callback(data.data);
@ -2992,7 +2998,10 @@ define(function(require){
self.callApi({
resource: 'callflow.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data) {
callback(data.data);
@ -3008,7 +3017,8 @@ define(function(require){
data: {
accountId: self.accountId,
filters: {
filter_owner_id: userId
filter_owner_id: userId,
paginate: 'false'
}
},
success: function(data) {
@ -3023,7 +3033,10 @@ define(function(require){
self.callApi({
resource: 'voicemail.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data) {
callback(data.data);
@ -3039,7 +3052,8 @@ define(function(require){
data: {
accountId: self.accountId,
filters: {
filter_owner_id: userId
filter_owner_id: userId,
paginate: 'false'
}
},
success: function(data) {
@ -3170,7 +3184,8 @@ define(function(require){
data: {
accountId: self.accountId,
filters: {
filter_type: 'conference'
filter_type: 'conference',
paginate: 'false'
}
},
success: function(data) {
@ -3197,7 +3212,8 @@ define(function(require){
data: {
accountId: self.accountId,
filters: {
filter_owner_id: userId
filter_owner_id: userId,
paginate: 'false'
}
},
success: function(data) {
@ -3307,7 +3323,8 @@ define(function(require){
data: {
accountId: self.accountId,
filters: {
filter_owner_id: userId
filter_owner_id: userId,
paginate: 'false'
}
},
success: function(data) {
@ -3338,7 +3355,10 @@ define(function(require){
self.callApi({
resource: 'user.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(dataUsers) {
callback(null, dataUsers.data);
@ -3359,7 +3379,10 @@ define(function(require){
self.callApi({
resource: 'device.getStatus',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(data, status) {
callback(null, data.data);
@ -3484,7 +3507,10 @@ define(function(require){
self.callApi({
resource: 'numbers.list',
data: {
accountId: self.accountId
accountId: self.accountId,
filters: {
paginate: 'false'
}
},
success: function(numbers) {
callback && callback(numbers.data);


Write Preview
Loading…
Cancel
Save