ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

Browse Source
This commit is contained in:
khk 2020-01-06 11:17:41 +09:00
commit 5ad4d69d38
7 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
View File

@ -376,13 +376,9 @@ export class GroupComponent implements OnInit, OnDestroy {
}
/** 수정불가 그룹 핸들링. */
if (
!!group &&
!!environment.customConfig &&
!!environment.customConfig.fixedGroupSeqs
) {
if (!!group && !!environment.productConfig.CommonSetting.fixedGroupSeqs) {
const fixedGroupSeqs: number[] =
environment.customConfig.fixedGroupSeqs;
environment.productConfig.CommonSetting.fixedGroupSeqs;
if (!!fixedGroupSeqs && fixedGroupSeqs.length > 0) {
if (fixedGroupSeqs.indexOf(group.seq) > -1) {
return false;
@ -442,12 +438,9 @@ export class GroupComponent implements OnInit, OnDestroy {
}
/** 수정불가 그룹 핸들링. */
if (
!!group &&
!!environment.customConfig &&
!!environment.customConfig.fixedGroupSeqs
) {
const fixedGroupSeqs: number[] = environment.customConfig.fixedGroupSeqs;
if (!!group && !!environment.productConfig.CommonSetting.fixedGroupSeqs) {
const fixedGroupSeqs: number[] =
environment.productConfig.CommonSetting.fixedGroupSeqs;
if (!!fixedGroupSeqs && fixedGroupSeqs.length > 0) {
if (fixedGroupSeqs.indexOf(group.seq) > -1) {
if (menuType === 'REMOVE_FROM_GROUP' || menuType === 'MOVE_BUDDY') {

8
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.ts
View File

@ -71,11 +71,9 @@ export class SelectGroupDialogComponent implements OnInit {
map(([buddyList, groupList]) => {
/** 수정불가 그룹 */
let fixedGroupSeqs: number[];
if (
!!environment.customConfig &&
!!environment.customConfig.fixedGroupSeqs
) {
fixedGroupSeqs = environment.customConfig.fixedGroupSeqs;
if (!!environment.productConfig.CommonSetting.fixedGroupSeqs) {
fixedGroupSeqs =
environment.productConfig.CommonSetting.fixedGroupSeqs;
}
const groupBuddyList: {

6
projects/ucap-webmessenger-app/src/environments/environment.daesang.dev.ts
View File

@ -68,6 +68,7 @@ export const environment: Environment = {
useMyDeptGroup: true,
myDeptGroupSeq: -5,
fixedGroupSeqs: [-5],
useTimerRoom: false,
timerRoomDefaultInterval: 24 * 60 * 60,
@ -89,10 +90,7 @@ export const environment: Environment = {
userKey: 'DaesangSSOProject',
isBase64: 'N'
},
appKey: '!@#$DAESANG%^&*',
/** 삭제,수정 불가 그룹 Seqs:number[] */
fixedGroupSeqs: [-5]
appKey: '!@#$DAESANG%^&*'
},
commonApiModuleConfig: {

6
projects/ucap-webmessenger-app/src/environments/environment.daesang.prod.ts
View File

@ -68,6 +68,7 @@ export const environment: Environment = {
useMyDeptGroup: true,
myDeptGroupSeq: -5,
fixedGroupSeqs: [-5],
useTimerRoom: false,
timerRoomDefaultInterval: 24 * 60 * 60,
@ -89,10 +90,7 @@ export const environment: Environment = {
userKey: 'DaesangSSOProject',
isBase64: 'N'
},
appKey: '!@#$DAESANG%^&*',
/** 삭제,수정 불가 그룹 Seqs:number[] */
fixedGroupSeqs: [-5]
appKey: '!@#$DAESANG%^&*'
},
commonApiModuleConfig: {

6
projects/ucap-webmessenger-app/src/environments/environment.dev.ts
View File

@ -68,6 +68,7 @@ export const environment: Environment = {
useMyDeptGroup: false,
myDeptGroupSeq: -999,
fixedGroupSeqs: [],
useTimerRoom: true,
timerRoomDefaultInterval: 24 * 60 * 60,
@ -85,10 +86,7 @@ export const environment: Environment = {
},
customConfig: {
appKey: '!@#$DAESANG%^&*',
/** 삭제,수정 불가 그룹 Seqs:number[] */
fixedGroupSeqs: []
appKey: '!@#$DAESANG%^&*'
},
commonApiModuleConfig: {

6
projects/ucap-webmessenger-app/src/environments/environment.prod.ts
View File

@ -68,6 +68,7 @@ export const environment: Environment = {
useMyDeptGroup: false,
myDeptGroupSeq: -999,
fixedGroupSeqs: [],
useTimerRoom: true,
timerRoomDefaultInterval: 24 * 60 * 60,
@ -85,10 +86,7 @@ export const environment: Environment = {
},
customConfig: {
appKey: '!@#$DAESANG%^&*',
/** 삭제,수정 불가 그룹 Seqs:number[] */
fixedGroupSeqs: []
appKey: '!@#$DAESANG%^&*'
},
commonApiModuleConfig: {

2
projects/ucap-webmessenger-app/src/environments/environment.type.ts
View File

@ -71,6 +71,8 @@ export interface Environment {
useMyDeptGroup: boolean;
/** 소속부서(내부서) 고정 그룹 SEQ */
myDeptGroupSeq: number;
/** 삭제,수정 불가 그룹 Seqs:number[] */
fixedGroupSeqs: number[];
/** 타이머대화방 사용유무 */
useTimerRoom: boolean;