Ovirt devel - May 2009 - [PATCH server] Bug 478729 - Cannot add vm to smart pool after select one vm

There were two javascript functions with the same name, and the wrong one was
being called. I renamed one to avoid conflicts.

Signed-off-by: Scott Seago <sseago at redhat.com>
---
 src/app/views/vm/add_to_smart_pool.rhtml |    3 ++-
 src/public/javascripts/ovirt.js          |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/views/vm/add_to_smart_pool.rhtml
b/src/app/views/vm/add_to_smart_pool.rhtml
index cdfe92d..161496b 100644
--- a/src/app/views/vm/add_to_smart_pool.rhtml
+++ b/src/app/views/vm/add_to_smart_pool.rhtml
@@ -20,7 +20,8 @@
              :vms_per_page => 40} %>
 </div>
 
-<%= popup_footer("add_vms_to_smart_pool('#{url_for :controller
=> "smart_pools",
+<%= popup_footer("add_vms_to_current_smart_pool('#{url_for
:controller =>
+                                                           
"smart_pools",
                                                      :action =>
"add_vms",
                                                      :id =>
@pool}')",
                  "Add Vms") %>
diff --git a/src/public/javascripts/ovirt.js b/src/public/javascripts/ovirt.js
index 2754817..67dc455 100644
--- a/src/public/javascripts/ovirt.js
+++ b/src/public/javascripts/ovirt.js
@@ -115,7 +115,7 @@ function add_storage_to_smart_pool(url)
                }, 'json');
     }
 }
-function add_vms_to_smart_pool(url)
+function add_vms_to_current_smart_pool(url)
 {
     vms= get_selected_checkboxes("add_smart_vms_grid_form");
     if (validate_selected(vms, "vm")) {
-- 
1.6.0.6

ACK

On Wed, May 27, 2009 at 4:26 PM, Scott Seago <sseago at redhat.com> wrote:
> There were two javascript functions with the same name, and the wrong one
> was being called. I renamed one to avoid conflicts.
>
> Signed-off-by: Scott Seago <sseago at redhat.com>
> ---
>  src/app/views/vm/add_to_smart_pool.rhtml |    3 ++-
>  src/public/javascripts/ovirt.js          |    2 +-
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/app/views/vm/add_to_smart_pool.rhtml
> b/src/app/views/vm/add_to_smart_pool.rhtml
> index cdfe92d..161496b 100644
> --- a/src/app/views/vm/add_to_smart_pool.rhtml
> +++ b/src/app/views/vm/add_to_smart_pool.rhtml
> @@ -20,7 +20,8 @@
>              :vms_per_page => 40} %>
>  </div>
>
> -<%= popup_footer("add_vms_to_smart_pool('#{url_for :controller
=>
> "smart_pools",
> +<%= popup_footer("add_vms_to_current_smart_pool('#{url_for
:controller =>
> +                                                           
"smart_pools",
>                                                      :action =>
"add_vms",
>                                                      :id =>
@pool}')",
>                  "Add Vms") %>
> diff --git a/src/public/javascripts/ovirt.js
> b/src/public/javascripts/ovirt.js
> index 2754817..67dc455 100644
> --- a/src/public/javascripts/ovirt.js
> +++ b/src/public/javascripts/ovirt.js
> @@ -115,7 +115,7 @@ function add_storage_to_smart_pool(url)
>                }, 'json');
>     }
>  }
> -function add_vms_to_smart_pool(url)
> +function add_vms_to_current_smart_pool(url)
>  {
>     vms= get_selected_checkboxes("add_smart_vms_grid_form");
>     if (validate_selected(vms, "vm")) {
> --
> 1.6.0.6
>
> _______________________________________________
> Ovirt-devel mailing list
> Ovirt-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/ovirt-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://listman.redhat.com/archives/ovirt-devel/attachments/20090528/d55576ce/attachment.htm>