verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Tarea #1506 worker.pbx quitar campo password
gitea/salix/dev This commit has test failures Details

This commit is contained in:
Javi Gallego 2019-06-04 12:54:41 +02:00
parent 62f4abf6ed
commit 0f5ebf42ec
6 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
back/models/sip.json
View File

@ -16,10 +16,8 @@
} }
}, },
"extension": { "extension": {
"type": "Number" "type": "String",
}, "required": true
"secret": {
"type": "String"
} }
}, },
"relations": { "relations": {

10
db/dump/fixtures.sql
View File

@ -1341,12 +1341,12 @@ INSERT INTO `vn`.`zoneIncluded` (`zoneFk`, `geoFk`, `isIncluded`)
(5, 4, 1), (5, 4, 1),
(5, 5, 1); (5, 5, 1);
INSERT INTO `pbx`.`sip`(`user_id`, `extension`, `secret`, `caller_id`) INSERT INTO `pbx`.`sip`(`user_id`, `extension`)
VALUES VALUES
(1, 1010, '123456', 'employee'), (1, 1010),
(3, 1101, '123456', 'agency'), (3, 1101),
(5, 1102, '123456', 'administrative'), (5, 1102),
(9, 1201, '123456', 'developer'); (9, 1201);
INSERT INTO `postgresql`.`person`(`person_id`, `name`, `nickname`, `nif`, `firstname`, `id_trabajador`) INSERT INTO `postgresql`.`person`(`person_id`, `name`, `nickname`, `nif`, `firstname`, `id_trabajador`)
SELECT w.id, w.lastName, u.nickname,CONCAT(RPAD(CONCAT(w.id,9),8,w.id),'A'),w.firstName,w.id SELECT w.id, w.lastName, u.nickname,CONCAT(RPAD(CONCAT(w.id,9),8,w.id),'A'),w.firstName,w.id

1
e2e/helpers/selectors.js
View File

@ -591,7 +591,6 @@ export default {
}, },
workerPbx: { workerPbx: {
extensionInput: 'vn-worker-pbx vn-input-number[model="$ctrl.worker.sip.extension"] input', extensionInput: 'vn-worker-pbx vn-input-number[model="$ctrl.worker.sip.extension"] input',
passwordInput: 'vn-worker-pbx vn-textfield[model="$ctrl.worker.sip.secret"] input',
saveButton: 'vn-worker-pbx vn-submit[label="Save"] input' saveButton: 'vn-worker-pbx vn-submit[label="Save"] input'
}, },
workerTimeControl: { workerTimeControl: {

2
e2e/paths/03-worker-module/01_pbx.spec.js
View File

@ -25,8 +25,6 @@ describe('Worker pbx path', () => {
const result = await nightmare const result = await nightmare
.clearInput(selectors.workerPbx.extensionInput) .clearInput(selectors.workerPbx.extensionInput)
.write(selectors.workerPbx.extensionInput, 4444) .write(selectors.workerPbx.extensionInput, 4444)
.clearInput(selectors.workerPbx.passwordInput)
.write(selectors.workerPbx.passwordInput, 666666)
.waitToClick(selectors.workerPbx.saveButton) .waitToClick(selectors.workerPbx.saveButton)
.waitForLastSnackbar(); .waitForLastSnackbar();

8
modules/worker/front/pbx/index.html
View File

@ -6,15 +6,11 @@
<vn-card pad-large> <vn-card pad-large>
<vn-vertical> <vn-vertical>
<vn-horizontal> <vn-horizontal>
<vn-input-number vn-one min="1" step="1" <vn-textfield
label="Extension" label="Extension"
model="$ctrl.worker.sip.extension"> model="$ctrl.worker.sip.extension">
</vn-input-number>
<vn-textfield
vn-one
label="Password"
model="$ctrl.worker.sip.secret">
</vn-textfield> </vn-textfield>
</vn-horizontal> </vn-horizontal>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>

3
modules/worker/front/pbx/index.js
View File

@ -10,8 +10,7 @@ class Controller {
const sip = this.worker.sip; const sip = this.worker.sip;
const params = { const params = {
userFk: this.worker.userFk, userFk: this.worker.userFk,
extension: sip.extension, extension: sip.extension
secret: sip.secret
}; };
this.$scope.watcher.check(); this.$scope.watcher.check();
this.$http.patch('/api/Sips', params).then(() => { this.$http.patch('/api/Sips', params).then(() => {