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.

Sign up for GitHub

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

Jump to bottom

Generic Object - fix extra vm.angularForm and nonused angularForm #3565

Merged
merged 1 commit into from Mar 13, 2018
Merged

Generic Object - fix extra vm.angularForm and nonused angularForm #3565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/static/generic_object/custom-image-component.html.haml
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
:title => t,
:alt => t,
:enabled => "true",
'on-click' => "vm.uploadClicked(angularForm)"}
'on-click' => "vm.uploadClicked()"}
Copy link
Contributor

Choose a reason for hiding this comment

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

Can't really call this a bug, since technically, nothing is broken w.r.t vm.uploadClicked right now, or nothing is getting fixed with this change.

.form-group{'ng-if' => "vm.pictureUrlPath !== '' && !vm.changeImage && !vm.pictureRemove"}
%label.col-md-2.control-label{"for" => "custom_image"}
= _("Current Custom Image File")
Expand Down
2 changes: 1 addition & 1 deletion app/views/static/generic_object/main_custom_button_form.html.haml
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@
= "<#{_('Choose')}>"
%span.help-block{"ng-show" => "angularForm.dialog_id.$error.required"}
= _("Required")
.form-group{"ng-class" => "{'has-error': vm.angularForm.display.$invalid}"}
.form-group{"ng-class" => "{'has-error': angularForm.display.$invalid}"}
Copy link
Contributor

Choose a reason for hiding this comment

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

although angularForm.display.$invalid is correct in this case, the error would never be exposed in this field which is a checkbox with Yes/No values - so technically, there is no "invalid" value here.
Anyway, good to have this change.

%label.col-md-2.control-label{"for" => "custom_button_open_url"}
= _("Open URL")
.col-md-8
Expand Down