Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
This commit is contained in:
14467
web_src/package-lock.json
generated
14467
web_src/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -154,7 +154,7 @@
|
||||
console.log(row)
|
||||
},
|
||||
addToGB: function(row){
|
||||
this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream}, this.initData);
|
||||
this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream, mediaServerId: row.mediaServerId}, this.initData);
|
||||
},
|
||||
removeFromGB: function(row){
|
||||
var that = this;
|
||||
|
||||
Reference in New Issue
Block a user