chef-server-webui 10.14.0.beta.3 → 10.14.0.rc.0

data/app/controllers/cookbooks.rb

@@ -151,7 +151,12 @@ class Cookbooks < Application
     when "plain"
       show_plain_file(url)
     else
-      syntax_highlight(url)
+      begin
+        syntax_highlight(url)
+      rescue
+        Chef::Log.error("Error while parsing file #{url}")
+        show_plain_file(url)
+      end
     end
   end
 

data/app/controllers/users.rb

@@ -133,6 +133,7 @@ class Users < Application
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @user = Chef::WebUIUser.new
       @_message = { :error => "Could not complete logging in." }
+      @environments = [] 
       render :login
     end   
   end

data/app/views/clients/index.html.haml

@@ -11,7 +11,7 @@
             %th  
             %th.last  
           - even = false;
-          - @clients_list.each do |client|
+          - @clients_list.sort_by {|value| value.downcase}.each do |client|
             %tr{ :class => even ? "even" : "odd" }
               %td{:colspan => 2}= link_to(client, url(:client, client))
               %td

data/app/views/cookbooks/index.html.haml

@@ -10,7 +10,7 @@
             %th Latest Version
             %th Other Versions
         %tbody.cookbook_versions
-          - @cl.keys.sort.each do |cookbook|
+          - @cl.keys.sort_by {|key,value| key.downcase}.each do |cookbook|
             - versions = @cl[cookbook]
             %tr
               %td= cookbook

data/app/views/databags/index.html.haml

@@ -12,7 +12,7 @@
               %th  
               %th.last  
           %tbody
-            - @databags.sort.each_with_index do |databag, index|
+            - @databags.sort_by {|key, value| value.downcase}.each_with_index do |databag, index|
               %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"}
                 %td{:colspan => 2}= link_to databag[0], url(:databag, { :id => databag[0] })
                 %td

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

@@ -11,7 +11,7 @@
             %th  
             %th.last  
           - even = false;
-          - @environment_list.each do |env|
+          - @environment_list.sort_by {|key,value| key.downcase}.each do |env|
             %tr{ :class => even ? "even" : "odd" }
               %td{:colspan => 2}= link_to(env[0], url(:environment, env[0]))
               %td

data/app/views/nodes/index.html.haml

@@ -18,7 +18,7 @@
             - else
               %td{:colspan => 4}= "You have no nodes - try connecting one, or creating or editing a #{link_to('node', url(:nodes))}"
           - else
-            - @node_list.each do |node|
+            - @node_list.sort_by {|value| value.downcase}.each do |node|
               %tr{:class => even ? "even": "odd" }
                 %td{:colspan => 2}= link_to node, url(:node, { :id => node } )
                 %td

data/app/views/roles/index.html.haml

@@ -11,7 +11,7 @@
             %th  
             %th.last  
           - even = false;
-          - @role_list.each do |role|
+          - @role_list.sort_by {|value| value.downcase}.each do |role|
             %tr{ :class => even ? "even" : "odd" }
               %td{:colspan => 2}= link_to(role[0], url(:role, role[0]))
               %td

data/app/views/users/index.html.haml

@@ -11,7 +11,7 @@
             %th  
             %th.last  
           - even = false
-          - @users.sort.each do |user, user_url|
+          - @users.sort_by {|key,value| key.downcase}.each do |user, user_url|
             %tr{:class => even ? "even": "odd" }
               %td{:colspan => 2}= link_to user, url(:users_show, :user_id => user)
               %td

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

@@ -1,3 +1,3 @@
 module ChefServerWebui
-  VERSION = '10.14.0.beta.3'
+  VERSION = '10.14.0.rc.0'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: chef-server-webui
 version: !ruby/object:Gem::Version 
-  hash: 2792674699
+  hash: -2959492522
   prerelease: 8
   segments: 
   - 10
   - 14
   - 0
-  - beta
-  - 3
-  version: 10.14.0.beta.3
+  - rc
+  - 0
+  version: 10.14.0.rc.0
 platform: ruby
 authors: 
 - Opscode
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-26 00:00:00 Z
+date: 2012-08-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement