diff --git a/dev-config.sh b/dev-config.sh index 47d77ebd..bf7314c7 100755 --- a/dev-config.sh +++ b/dev-config.sh @@ -2,8 +2,8 @@ case "$1" in *) - cp ./dev-config/ngcp-panel_csc.customtt.tt2 /etc/ngcp-config/templates/etc/nginx/sites-available/ - cp ./dev-config/ngcp-panel_params.customtt.tt2 /etc/ngcp-config/templates/etc/nginx/ + cp -f ./dev-config/ngcp-panel_csc.customtt.tt2 /etc/ngcp-config/templates/etc/nginx/sites-available/ + cp -f ./dev-config/ngcp-panel_params.customtt.tt2 /etc/ngcp-config/templates/etc/nginx/ ngcpcfg set /etc/ngcp-config/config.yml www_admin.http_csc.csc_js_enable=yes ngcpcfg set /etc/ngcp-config/config.yml rtcengine.enable=yes diff --git a/dev-config/ngcp-panel_csc.customtt.tt2 b/dev-config/ngcp-panel_csc.customtt.tt2 index c2b3c02e..318fd926 100644 --- a/dev-config/ngcp-panel_csc.customtt.tt2 +++ b/dev-config/ngcp-panel_csc.customtt.tt2 @@ -110,13 +110,13 @@ server { location ~* /rtc/api(/)?$ { add_header 'Access-Control-Allow-Origin' '*' always; - add_header 'Access-Control-Allow-Headers' 'Authorization,DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always; + add_header 'Access-Control-Allow-Headers' 'Prefer,Authorization,DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always; add_header 'Access-Control-Allow-Methods' 'POST, GET, PUT, DELETE, PATCH, OPTIONS' always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range,Location'; if ($request_method = 'OPTIONS') { add_header 'Access-Control-Allow-Origin' '*' always; - add_header 'Access-Control-Allow-Headers' 'Authorization,DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always; + add_header 'Access-Control-Allow-Headers' 'Prefer,Authorization,DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always; add_header 'Access-Control-Allow-Methods' 'POST, GET, PUT, DELETE, PATCH, OPTIONS' always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range,Location'; add_header 'Access-Control-Max-Age' '1728000' always; @@ -154,13 +154,13 @@ server { location /rtc/files { add_header 'Access-Control-Allow-Origin' '*' always; - add_header 'Access-Control-Allow-Headers' 'Authorization,DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always; + add_header 'Access-Control-Allow-Headers' 'Prefer,Authorization,DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always; add_header 'Access-Control-Allow-Methods' 'POST, GET, PUT, DELETE, PATCH, OPTIONS' always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range,Location'; if ($request_method = 'OPTIONS') { add_header 'Access-Control-Allow-Origin' '*' always; - add_header 'Access-Control-Allow-Headers' 'Authorization,DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always; + add_header 'Access-Control-Allow-Headers' 'Prefer,Authorization,DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always; add_header 'Access-Control-Allow-Methods' 'POST, GET, PUT, DELETE, PATCH, OPTIONS' always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range,Location'; add_header 'Access-Control-Max-Age' '1728000' always; diff --git a/dev-config/ngcp-panel_params.customtt.tt2 b/dev-config/ngcp-panel_params.customtt.tt2 index 04a100d8..fc070e93 100644 --- a/dev-config/ngcp-panel_params.customtt.tt2 +++ b/dev-config/ngcp-panel_params.customtt.tt2 @@ -5,13 +5,13 @@ fastcgi_param PATH_INFO $fastcgi_script_name; fastcgi_pass unix:/var/run/fastcgi/ngcp-panel.sock; add_header 'Access-Control-Allow-Origin' '*' always; -add_header 'Access-Control-Allow-Headers' 'Authorization,DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always; +add_header 'Access-Control-Allow-Headers' 'Prefer,Authorization,DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always; add_header 'Access-Control-Allow-Methods' 'POST, GET, PUT, DELETE, PATCH, OPTIONS' always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range,Location'; if ($request_method = 'OPTIONS') { add_header 'Access-Control-Allow-Origin' '*' always; - add_header 'Access-Control-Allow-Headers' 'Authorization,DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always; + add_header 'Access-Control-Allow-Headers' 'Prefer,Authorization,DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type' always; add_header 'Access-Control-Allow-Methods' 'POST, GET, PUT, DELETE, PATCH, OPTIONS' always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range,Location'; add_header 'Access-Control-Max-Age' '1728000' always; diff --git a/src/components/pages/CallBlocking/CscCallBlocking.vue b/src/components/pages/CallBlocking/CscCallBlocking.vue index 27deeda3..4e7cb843 100644 --- a/src/components/pages/CallBlocking/CscCallBlocking.vue +++ b/src/components/pages/CallBlocking/CscCallBlocking.vue @@ -68,7 +68,7 @@ import CscPage from '../../CscPage' import CscToggle from '../../form/CscToggle' import { QInput, QCard, QBtn, QField, QIcon, QCardTitle, QCardActions, Dialog, QSpinnerMat, QToggle, - Toast, QList, QItem, QItemSide, QItemMain, QCardMain, QInnerLoading, QOptionGroup, QSelect, QRadio } from 'quasar-framework' + Toast, QList, QItem, QItemSide, QItemMain, QItemTile, QCardMain, QInnerLoading, QOptionGroup, QSelect, QRadio } from 'quasar-framework' export default { name: 'csc-call-blocking', props: [ @@ -111,6 +111,7 @@ QItem, QItemSide, QItemMain, + QItemTile, QCardMain, QIcon, QCardTitle, diff --git a/src/components/pages/PbxConfiguration/CscPbxGroup.vue b/src/components/pages/PbxConfiguration/CscPbxGroup.vue index f9716d4e..1babaec0 100644 --- a/src/components/pages/PbxConfiguration/CscPbxGroup.vue +++ b/src/components/pages/PbxConfiguration/CscPbxGroup.vue @@ -23,7 +23,7 @@ + :after="huntTimeoutButtons" :min="0" @keyup.enter="saveHuntTimeout" /> diff --git a/src/components/pages/PbxConfiguration/CscPbxGroupAddForm.vue b/src/components/pages/PbxConfiguration/CscPbxGroupAddForm.vue index ee707804..43567973 100644 --- a/src/components/pages/PbxConfiguration/CscPbxGroupAddForm.vue +++ b/src/components/pages/PbxConfiguration/CscPbxGroupAddForm.vue @@ -11,7 +11,7 @@ + clearable :min="1" :max="1000000" :float-label="$t('pbxConfig.extension')" /> + :float-label="$t('pbxConfig.huntTimeout')" suffix="seconds" :min="1" :max="3600" /> + multiple chips clearable :after="aliasNumberButtons" /> + :after="groupButtons" /> diff --git a/src/components/pages/PbxConfiguration/CscPbxSeatAddForm.vue b/src/components/pages/PbxConfiguration/CscPbxSeatAddForm.vue index a5ed98cb..3c614c8f 100644 --- a/src/components/pages/PbxConfiguration/CscPbxSeatAddForm.vue +++ b/src/components/pages/PbxConfiguration/CscPbxSeatAddForm.vue @@ -11,7 +11,7 @@ + clearable :min="1" :max="1000000" :float-label="$t('pbxConfig.extension')" />