Browse Source

UI-3298: Hide device form on user creation if there aren't provisioners (#118)

* Hide device form on user creation if there aren't provisioners

* Prevent request if there no provisioner API

* use appFlags to looks for valid provisioner
4.3
Ricardo Merino 7 years ago
committed by Joris Tirado
parent
commit
d46cdad935
3 changed files with 11 additions and 0 deletions
  1. +3
    -0
      app.js
  2. +6
    -0
      submodules/users/users.js
  3. +2
    -0
      submodules/users/views/creation.html

+ 3
- 0
app.js View File

@ -36,6 +36,7 @@ define(function(require) {
subscribe: {}, subscribe: {},
appFlags: { appFlags: {
common: { common: {
hasProvisioner: false,
outboundPrivacy: [ outboundPrivacy: [
'default', 'default',
'none', 'none',
@ -60,6 +61,8 @@ define(function(require) {
initApp: function(callback) { initApp: function(callback) {
var self = this; var self = this;
self.appFlags.common.hasProvisioner = _.isString(monster.config.api.provisioner);
monster.pub('auth.initApp', { monster.pub('auth.initApp', {
app: self, app: self,
callback: callback callback: callback


+ 6
- 0
submodules/users/users.js View File

@ -1748,6 +1748,11 @@ define(function(require) {
}); });
}, },
provisioners: function(callback) { provisioners: function(callback) {
if (!self.appFlags.common.hasProvisioner) {
callback(null);
return;
}
monster.request({ monster.request({
resource: 'common.chooseModel.getProvisionerData', resource: 'common.chooseModel.getProvisionerData',
data: {}, data: {},
@ -1959,6 +1964,7 @@ define(function(require) {
usersFormatAddUser: function(data) { usersFormatAddUser: function(data) {
var self = this, var self = this,
formattedData = { formattedData = {
hasProvisioner: self.appFlags.common.hasProvisioner,
sendToSameEmail: true, sendToSameEmail: true,
nextExtension: '', nextExtension: '',
listExtensions: {}, listExtensions: {},


+ 2
- 0
submodules/users/views/creation.html View File

@ -86,6 +86,7 @@
</div> </div>
</div> </div>
{{#if hasProvisioner}}
<div class="row-fluid separator"></div> <div class="row-fluid separator"></div>
<div class="row-fluid user-section-title"> <div class="row-fluid user-section-title">
@ -124,6 +125,7 @@
<input type="text" id="mac_address" name="user.device.mac_address" placeholder="19:33:1A:B2:12:58"> <input type="text" id="mac_address" name="user.device.mac_address" placeholder="19:33:1A:B2:12:58">
</div> </div>
</div> </div>
{{/if}}
</form> </form>
<div> <div>
<div class="dialog-buttons-wrapper add-user-actions"> <div class="dialog-buttons-wrapper add-user-actions">


Loading…
Cancel
Save