Merge pull request #2345 from bbuckingham/select_library

965776 - allow library to be selectable
Katello · May 22, 2013 · 2256eb1 · 2256eb1
2 parents e6a3360 + c2b2b66
commit 2256eb1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/assets/javascripts/widgets/path_selector.js b/app/assets/javascripts/widgets/path_selector.js
@@ -41,7 +41,6 @@ KT.path_select = function(div_id, name, environments, options_in){
         init = function(){
             div = $('#' + KT.common.escapeId(div_id));
             paths_id = "path_select_" + name;
-            options.library_select = default_opt(options_in.library_select, true);
             options.inline = default_opt(options_in.inline, false);
             options.activate_on_click = default_opt(options_in.activate_on_click, false);
             options.select_mode = default_opt(options_in.select_mode, 'none');

diff --git a/app/controllers/distributors_controller.rb b/app/controllers/distributors_controller.rb
@@ -253,7 +253,8 @@ def edit
     # Stuff into var for use in spec tests
     @locals_hash = { :distributor => @distributor, :editable => @distributor.editable?,
                     :releases => releases, :releases_error => releases_error, :name => controller_display_name,
-                    :environments => environment_paths(library_path_element, environment_path_element("distributors_readable?")) }
+                    :environments => environment_paths(library_path_element("distributors_readable?"),
+                                                       environment_path_element("distributors_readable?")) }
     render :partial => "edit", :locals => @locals_hash
   end
 

diff --git a/app/controllers/systems_controller.rb b/app/controllers/systems_controller.rb
@@ -318,7 +318,8 @@ def edit
     # Stuff into var for use in spec tests
     @locals_hash = { :system => @system, :editable => @system.editable?,
                     :releases => releases, :releases_error => releases_error, :name => controller_display_name,
-                    :environments => environment_paths(library_path_element, environment_path_element("systems_readable?")) }
+                    :environments => environment_paths(library_path_element("systems_readable?"),
+                                                       environment_path_element("systems_readable?")) }
     render :partial => "edit", :locals => @locals_hash
   end
 
@@ -385,7 +386,8 @@ def show
       # Stuff into var for use in spec tests
       @locals_hash = { :system => @system, :editable => @system.editable?,
                       :releases => releases, :releases_error => releases_error, :name => controller_display_name,
-                      :environments => environment_paths(library_path_element, environment_path_element("systems_readable?"))}
+                      :environments => environment_paths(library_path_element("systems_readable?"),
+                                                         environment_path_element("systems_readable?"))}
 
       if request.xhr?
         render :show_nutupane, :leyout => false, :locals => @locals_hash