chef-server-webui 0.10.0.beta.6 → 0.10.0.beta.7

data/app/controllers/environments.rb

@@ -203,7 +203,7 @@ class Environments < Application
   end
 
   def process_params(name=params[:name])
-    {:name => name, :description => params[:description], :attributes => params[:attributes], :cookbook_version => search_params_for_cookbook_version_constraints}
+    {:name => name, :description => params[:description], :default_attributes => params[:default_attributes], :override_attributes => params[:override_attributes], :cookbook_version => search_params_for_cookbook_version_constraints}
   end
 
   def search_params_for_cookbook_version_constraints

data/app/controllers/openid_consumer.rb

@@ -121,10 +121,10 @@ class OpenidConsumer < Application
 
   private
   def is_authorized_openid_provider?(openid, authorized_providers)
-    Chef::Log.debug("checking for valid openid provider: openid: #{openid}, authorized providers: #{authorized_providers}")
+    Chef::Log.debug("Checking for valid openid provider: openid: #{openid}, authorized providers: #{authorized_providers}")
     if authorized_providers and openid
       if authorized_providers.length > 0
-        authorized_providers.detect { |p| Chef::Log.debug("openid: #{openid} (#{openid.class}), p: #{p} (#{p.class})"); openid.match(p) }
+        authorized_providers.detect { |p| Chef::Log.debug("Openid: #{openid} (#{openid.class}), p: #{p} (#{p.class})"); openid.match(p) }
       else
         true
       end
@@ -134,10 +134,10 @@ class OpenidConsumer < Application
   end
    
   def is_authorized_openid_identifier?(openid, authorized_identifiers)
-    Chef::Log.debug("checking for valid openid identifier: openid: #{openid}, authorized openids: #{authorized_identifiers}")
+    Chef::Log.debug("Checking for valid openid identifier: openid: #{openid}, authorized openids: #{authorized_identifiers}")
     if authorized_identifiers and openid
       if authorized_identifiers.length > 0 
-        authorized_identifiers.detect { |p| Chef::Log.debug("openid: #{openid} (#{openid.class}), p: #{p} (#{p.class})"); openid == p } 
+        authorized_identifiers.detect { |p| Chef::Log.debug("Openid: #{openid} (#{openid.class}), p: #{p} (#{p.class})"); openid == p } 
       else
         true
       end

data/app/views/environments/_form.html.erb

@@ -53,7 +53,7 @@
               </td>
               <td>
                 <input id="cookbook_version_0000"
-                       class="text" name="cookbook_version_selector" 
+                       class="text" name="cookbook_version_selector"
                        onfocus="clearVersionBox(this, '0000')"
                        onblur="validateVersionBoxValue(this, '0000')"
                        value="0.0.0">
@@ -68,8 +68,8 @@
     </div>
 
     <div class="group form attrEditor">
-      <label class="label">Environment Attributes</label>
-      <%= partial 'layout/jsonedit', :json =>  @environment.attributes.to_json%>
+      <label class="label">Environment Default and Override Attributes</label>
+      <%= partial 'layout/jsonedit', :json => { :defaults => @environment.default_attributes, :overrides => @environment.override_attributes }.to_json%>
       <span class="description">
         A JSON hash for attributes of this environment. These attributes will be applied according to the attribute precedence rules.
       </span>

data/app/views/environments/show.html.haml

@@ -26,6 +26,11 @@
                   %tr
                     %td= name
                     %td= versions
-          .left
-            %h3 Attributes
-            = build_tree('attrs', @environment.attributes)
+                    
+          .left 
+            %h3 Default Attributes
+            = build_tree('defattrs', @environment.default_attributes)
+
+          .left 
+            %h3 Override Attributes
+            = build_tree('overattrs', @environment.override_attributes)

data/lib/chef-server-webui/version.rb

@@ -1,3 +1,3 @@
 module ChefServerWebui
-  VERSION = '0.10.0.beta.6'
+  VERSION = '0.10.0.beta.7'
 end

data/public/javascripts/chef.js

@@ -53,9 +53,7 @@ $(document).ready(function(){
   });
 
   $('form#edit_environment, form#create_environment').submit(function(event) {
-    var form = $(this);
-    form.append('<input type="hidden" id="attributes" name="attributes"/>');
-    $('input#attributes').attr('value', BCJTEP.save('json'))
+    buildHiddenFormFromJSONEditor($(this));
   });
 
   $('form#edit_node, form#create_node').submit(function(event) {

metadata

@@ -2,7 +2,7 @@
 name: chef-server-webui
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.10.0.beta.6
+  version: 0.10.0.beta.7
 platform: ruby
 authors: 
 - Opscode
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -07:00
+date: 2011-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency