foreman-katello-engine 0.0.14 → 0.0.19

data/app/helpers/foreman_katello_engine/hosts_and_hostgroups_helper.rb

@@ -23,44 +23,32 @@ module ForemanKatelloEngine
       end
     end
 
-    def envs_by_kt_env(envs)
-      envs.group_by do |env|
-        env.katello_id.split('/')[1]
-      end
-    end
-
-    def envs_without_kt_org
-      envs_without_kt_org = ::Environment.all.reject(&:katello_id)
-    end
-
-    def envs_without_kt_org_options
-      options_from_collection_for_select(envs_without_kt_org,
-                                         :id,
-                                         :to_label,
-                                         (@host || @hostgroup).environment_id)
-    end
-
     def grouped_env_options
-      envs_by_org = envs_by_kt_org.reduce({}) do |hash, (org, envs)|
-        hash.update(org => envs_by_kt_env(envs))
-      end
-      grouped_options = envs_by_org.sort_by(&:first).map do |org, envs_by_env|
-        optgroup = %[<optgroup label="#{org}">]
-        opts = envs_by_env.sort_by(&:first).map do |kt_env, envs|
-          envs.sort_by(&:katello_id).map do |env|
-            selected = env.id == (@host || @hostgroup).environment_id ? "selected" : ""
-            if cv = env.katello_id.split('/')[2]
-              %[<option value="#{env.id}" class="kt-cv" #{selected}>#{cv}</option>]
-            else
-              %[<option value="#{env.id}" class="kt-env" #{selected}>#{kt_env}</option>]
-            end
-          end.join
+      grouped_options = envs_by_kt_org.sort_by(&:first).map do |kt_org_label, envs_by_org|
+        optgroup = %[<optgroup label="#{kt_org_label}">]
+        opts = envs_by_org.sort_by(&:katello_id).reduce({}) do |env_options, env|
+          selected = env.id == (@host || @hostgroup).environment_id ? "selected" : nil
+          kt_env_label = env.katello_id.split('/')[1]
+          env_options[kt_env_label] ||= selected
+          env_options
+        end.sort_by(&:first).map do |kt_env_label, selected|
+          %[<option value="#{kt_org_label}/#{kt_env_label}" class="kt-env" #{selected}>#{kt_env_label}</option>]
         end.join
         optgroup << opts
         optgroup << '</optgroup>'
       end.join
+      grouped_options.insert(0, %[<option value=""></option>])
+      grouped_options.html_safe
+    end
+
+    def content_view_options
+      cv_options = ::Environment.order(:katello_id).all.map do |env|
+        selected = env.id == (@host || @hostgroup).environment_id ? "selected" : ""
+        env_text = env.katello_id ? env.katello_id.split('/')[2] : env.name
+        %[<option value="#{env.id}" data-katello-id="#{env.katello_id}" #{selected}>#{env_text}</option>]
+      end.join
 
-      return grouped_options.html_safe + envs_without_kt_org_options
+      return cv_options.html_safe
     end
 
   end

data/app/views/foreman_katello_engine/activation_keys/_host_environment_select.html.erb

@@ -3,9 +3,48 @@
   option.kt-cv  { margin-left: 1em; }
 </style>
 
-<%= field(f, :environment_id, {:include_blank => true}) do
+<script>
+$(function () {
+    function ktUpdateContentViews() {
+        var ktEnvId = $("#kt_environment_id").val();
+        var cvSelect = $("#hostgroup_environment_id");
+        if(cvSelect.length == 0) {
+            cvSelect = $("#host_environment_id");
+        }
+        cvSelect.children("option").each(function (i, option) {
+            var option = $(option);
+            var display = false
+            if(ktEnvId &&
+               option.attr('data-katello-id') &&
+               option.attr('data-katello-id').indexOf(ktEnvId) == 0) {
+                display = true;
+            } else if(!ktEnvId && !option.attr('data-katello-id')) {
+                display = true;
+            }
+            if(display) {
+                option.show();
+            } else {
+                if(cvSelect.val() == option.val()) {
+                    cvSelect.val('');
+                };
+                option.hide();
+            }
+        });
+    }
+
+    ktUpdateContentViews();
+    $("#kt_environment_id").change(ktUpdateContentViews);
+});
+</script>
+
+<%= field(f, "Environment", {:include_blank => true}) do
+    select_tag :kt_environment_id,
+             grouped_env_options
+end %>
+
+<%= field(f, "Content View", {:include_blank => true}) do
     f.select :environment_id,
-             grouped_env_options,
+             content_view_options,
              {:include_blank =>true},
              {:onchange => 'update_puppetclasses(this);',
               :"data-url" => environment_selected_hostgroups_path,

data/app/views/foreman_katello_engine/activation_keys/_host_tab_pane.html.erb

@@ -62,7 +62,8 @@ $(function() {
     function ktHideParams() {
         var paramsToHide = [ktFindParamContainer(KT_AK_LABEL),
                             ktFindParamContainer('kt_org'),
-                            ktFindParamContainer('kt_env')];
+                            ktFindParamContainer('kt_env'),
+                            ktFindParamContainer('kt_cv')];
         $.each(paramsToHide, function (i, paramContainer) {
             if(paramContainer) {
                 paramContainer.hide();
@@ -75,20 +76,12 @@ $(function() {
         var selectedOption = $("#hostgroup_environment_id option[ value ='" + selectedEnvId + "' ]");
 
         var ktEnvOption, ktCvOption, ktOrgLabel, ktEnvLabel, ktCvLabel;
-        if(selectedOption.hasClass('kt-cv')) {
-            ktCvOption = selectedOption;
-            ktEnvOption = ktCvOption.prevAll('option.kt-env').first();
-        } else if(selectedOption.hasClass('kt-env')) {
-            ktEnvOption = selectedOption;
-        }
-
-        if(ktEnvOption) {
-            ktEnvLabel = ktEnvOption.text();
-            ktOrgLabel = ktEnvOption.parent().attr('label');
-        }
-
-        if(ktCvOption) {
-            ktCvLabel = ktCvOption.text();
+        var ktEnvId = selectedOption.attr('data-katello-id');
+        if(ktEnvId) {
+            var idParts = ktEnvId.split('/');
+            ktOrgLabel  = idParts[0];
+            ktEnvLabel  = idParts[1];
+            ktCvLabel   = idParts[2];
         }
         return [ktOrgLabel, ktEnvLabel, ktCvLabel];
     }

data/foreman-katello-engine.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "foreman-katello-engine"
-  s.version = "0.0.14"
+  s.version = "0.0.19"
 
   s.authors = ["Katello"]
   s.date = "2013-03-04"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-katello-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -54,36 +54,36 @@ files:
 - LICENSE
 - Rakefile
 - README.md
-- app/models/foreman_katello_engine/environment.rb
-- app/models/setting/katello.rb
+- app/overrides/add_katello_link.rb
+- app/overrides/add_activation_keys_input.rb
+- app/assets/images/foreman_katello_engine/link.png
 - app/helpers/foreman_katello_engine/hosts_and_hostgroups_helper.rb
 - app/helpers/foreman_katello_engine/katello_urls_helper.rb
+- app/views/unattended/snippets/_subscription_manager_registration.erb
+- app/views/unattended/kickstart-katello_rhel.erb
+- app/views/unattended/kickstart-katello.erb
+- app/views/foreman_katello_engine/layout/_katello_link.html.erb
 - app/views/foreman_katello_engine/activation_keys/_host_tab_pane.html.erb
 - app/views/foreman_katello_engine/activation_keys/_host_tab.html.erb
 - app/views/foreman_katello_engine/activation_keys/_host_environment_select.html.erb
-- app/views/foreman_katello_engine/layout/_katello_link.html.erb
-- app/views/unattended/kickstart-katello.erb
-- app/views/unattended/snippets/_subscription_manager_registration.erb
-- app/views/unattended/kickstart-katello_rhel.erb
-- app/assets/images/foreman_katello_engine/link.png
-- app/overrides/add_activation_keys_input.rb
-- app/overrides/add_katello_link.rb
 - app/controllers/foreman_katello_engine/api/environments_controller.rb
 - app/controllers/foreman_katello_engine/activation_keys_controller.rb
+- app/models/setting/katello.rb
+- app/models/foreman_katello_engine/environment.rb
 - config/routes.rb
 - db/migrate/20130418105901_add_katello_ptables.rb
 - db/migrate/20130416152224_add_katello_templates.rb
 - db/migrate/20130419110332_update_environments_add_katello_id.rb
-- lib/foreman-katello-engine.rb
+- lib/foreman_katello_engine.rb
 - lib/foreman_katello_engine/engine.rb
 - lib/foreman_katello_engine/renderer.rb
 - lib/foreman_katello_engine/bindings.rb
-- lib/foreman_katello_engine.rb
+- lib/foreman-katello-engine.rb
 - test/test_helper.rb
 - test/lib/settings_test.rb
 - test/lib/bindings_test.rb
-- test/functional/activation_keys_controller_test.rb
 - test/functional/api/environments_controller_test.rb
+- test/functional/activation_keys_controller_test.rb
 homepage: http://github.com/katello/foreman-katello-engine
 licenses:
 - GPL-3
@@ -105,8 +105,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Katello specific parts of Foreman
 test_files: []
+has_rdoc: