Skip to content
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

Network router gateway setup #716

Merged
merged 4 commits into from
Mar 20, 2017
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Better required fields
  • Loading branch information
gildub committed Mar 20, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 5a484aa7f00ccd950c1f6ee801e76440d8acd1e6
2 changes: 1 addition & 1 deletion app/views/network_router/_common_new_edit.haml
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@
:name => "name",
"ng-model" => "networkRouterModel.name",
"ng-maxlength" => 128,
:miqrequired => true,
"required" => "",
:checkchange => true}
%h3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fields that are Required need to be explicitly shown as Required including the dropdowns below

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AparnaKarve , all the router gateway related field are optional

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gildub Some fields are Required, because otherwise the Add button will not light up (turn blue, that is) as seen in the screenshots below --

screen shot 2017-03-17 at 4 39 33 pm

screen shot 2017-03-17 at 4 44 37 pm

We need to clearly say Required for every Required field, it just makes for a better UX, that's all.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AparnaKarve,

Oh sorry, yes the name is required and that one was removed by mistake, thanks

@@ -50,6 +49,7 @@
"ng-change" => "filterCloudNetworkChanged(networkRouterModel.cloud_network_id)",
"pf-select" => true,
"ng-selected" => "networkRouterModel.cloud_network_id",
"ng-required" => "networkRouterModel.enable_snat == true",
"selectpicker-for-select-tag" => ""}
%option{"value" => ""}
= "<#{_('Choose')}>"
1 change: 0 additions & 1 deletion app/views/network_router/add_interface_select.html.haml
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
options_for_select([["<#{_('Choose')}>", nil]] + @subnet_choices.sort),
"ng-model" => "networkRouterModel.cloud_subnet_id",
"required" => "",
:miqrequired => true,
:checkchange => true,
"selectpicker-for-select-tag" => "")
= render :partial => "layouts/angular/x_custom_form_buttons_angular",
2 changes: 0 additions & 2 deletions app/views/network_router/new.html.haml
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
options_for_select([["<#{_('Choose')}>", nil]] + @network_provider_choices.sort),
"ng-model" => "networkRouterModel.ems_id",
"required" => "",
:miqrequired => true,
:checkchange => true,
"ng-change" => "filterNetworkManagerChanged(networkRouterModel.ems_id)",
"selectpicker-for-select-tag" => "")
@@ -29,7 +28,6 @@
options_for_select([["<#{_('Choose')}>", nil]] + @cloud_tenant_choices.sort),
"ng-model" => "networkRouterModel.cloud_tenant_id",
"required" => "",
:miqrequired => true,
:checkchange => true,
"selectpicker-for-select-tag" => "")

Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
options_for_select([["<#{_('Choose')}>", nil]] + @subnet_choices.sort),
"ng-model" => "networkRouterModel.cloud_subnet_id",
"required" => "",
:miqrequired => true,
:checkchange => true,
"selectpicker-for-select-tag" => "")
= render :partial => "layouts/angular/x_custom_form_buttons_angular",