fixes theforeman#1697 - hostgroup class listing showed all classes re…

…gardless of environment
SophosLabs-zz · Jun 21, 2012 · 8f34dc6 · 8f34dc6
1 parent 1f03a56
commit 8f34dc6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/app/views/puppetclasses/_class_selection.html.erb b/app/views/puppetclasses/_class_selection.html.erb
@@ -34,7 +34,7 @@
     </div>
     <div class="row">
       <%= render "puppetclasses/classes",
-        :puppetclasses => (obj.is_a?(Host) ? @environment.puppetclasses : Puppetclass.all), :selected_puppet_classes => obj.all_puppetclasses,
+        :puppetclasses => (defined?(@environment) ? @environment.puppetclasses : Puppetclass.all), :selected_puppet_classes => obj.all_puppetclasses,
         :type => obj.class.to_s.downcase
       %>
     </div>

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
@@ -293,3 +293,22 @@ $(function() {
     return false;
   });
 });
+function update_puppetclasses(element) {
+  var host_id = $(element).attr('data-host-id');
+  var env_id = $('*[id*=environment_id]').attr('value');
+  var url = $(element).attr('data-url');
+  var hostgroup_id = $('*[id*=hostgroup_id]').attr('value');
+  if (env_id == "") return;
+  $.ajax({
+    type: 'post',
+    url:  url,
+    data:'host_id=' + host_id + '&hostgroup_id=' + hostgroup_id + '&environment_id=' + env_id,
+    success: function(request) {
+      $('#puppet_klasses').html(request);
+    },
+    complete: function() {
+      $('#hostgroup_indicator').hide();
+      $('[rel="twipsy"]').tooltip();
+    }
+  })
+}
diff --git a/public/javascripts/host_edit.js b/public/javascripts/host_edit.js
@@ -203,25 +203,7 @@ function hostgroup_changed(element) {
   }
 }
 
-function update_puppetclasses(element) {
-  var host_id = $(element).attr('data-host-id');
-  var env_id = $('*[id*=environment_id]').attr('value');
-  var url = $(element).attr('data-url');
-  var hostgroup_id = $('*[id*=hostgroup_id]').attr('value');
-  if (env_id == "") return;
-  $.ajax({
-    type: 'post',
-    url:  url,
-    data:'host_id=' + host_id + '&hostgroup_id=' + hostgroup_id + '&environment_id=' + env_id,
-    success: function(request) {
-      $('#puppet_klasses').html(request);
-    },
-    complete: function() {
-      $('#hostgroup_indicator').hide();
-      $('[rel="twipsy"]').tooltip();
-    }
-  })
-}
+
 function hypervisor_selected(element){
   var hypervisor_id = $(element).val();
   var url = $(element).attr('data-url');