-
Notifications
You must be signed in to change notification settings - Fork 1.3k
conditional broadcastUri #5745
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
conditional broadcastUri #5745
Conversation
|
@DaanHoogland a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress. |
|
UI build: ✔️ |
weizhouapache
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
|
@DaanHoogland a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress. |
|
UI build: ✔️ |
sureshanaparti
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
code LGTM
ui/src/config/section/network.js
Outdated
| details: ['name', 'id', 'description', 'type', 'traffictype', 'vpcid', 'vlan', 'broadcasturi', 'cidr', 'ip6cidr', 'netmask', 'gateway', 'aclname', 'ispersistent', 'restartrequired', 'reservediprange', 'redundantrouter', 'networkdomain', 'zonename', 'account', 'domain'], | ||
| columns: () => { | ||
| var fields = ['name', 'state', 'type', 'vpcname', 'cidr', 'ip6cidr', 'broadcasturi', 'domain', 'account', 'zonename'] | ||
| if (!['Admin'].includes(store.getters.userInfo.roletype)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
may be, this can be moved to a util method isAdmin()
| if (!['Admin'].includes(store.getters.userInfo.roletype)) { | |
| if (!isAdmin()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
makes sense but
$ grep -r isAdmin\ \(\)\ \{ ui/src/*
ui/src/views/compute/KubernetesServiceTab.vue: isAdmin () {
ui/src/views/network/CreateNetwork.vue: isAdmin () {
ui/src/views/network/UpdateNetwork.vue: isAdmin () {
ui/src/views/network/CreateIsolatedNetworkForm.vue: isAdmin () {
ui/src/views/network/CreateL2NetworkForm.vue: isAdmin () {
ui/src/views/network/CreateSharedNetworkForm.vue: isAdmin () {
ui/src/views/offering/AddComputeOffering.vue: isAdmin () {
ui/src/views/offering/AddDiskOffering.vue: isAdmin () {
ui/src/views/offering/AddNetworkOffering.vue: isAdmin () {
ui/src/views/offering/AddVpcOffering.vue: isAdmin () {
ui/src/views/offering/UpdateOfferingAccess.vue: isAdmin () {
I think it should also be unified and made available in a generic way, than.
|
@sureshanaparti a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress. |
|
UI build: ✔️ |
utchoang
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
|
Verified UI, Broadcast URI column not displayed for user. |
|
Smoke tests not required for UI changes. Merging this based on the LGTMs, manual test and travis job. |
Description
This PR...
Fixes: #5596
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?