@@ -31,11 +31,10 @@ class Cookbooks < Application
   attr_reader :cookbook_id
   def params_helper
     @cookbook_id = params[:id] || params[:cookbook_id]
-    @num_versions = params[:num_versions] || 6
   end
 
-  def fetch_cookbook_versions(num_versions=6)
-    url = if session[:environment]
+  def fetch_cookbook_versions(num_versions, use_envs=true)
+    url = if use_envs
             "environments/#{session[:environment]}/cookbooks"
           else
             "cookbooks"
@@ -96,7 +95,9 @@ def show
   # provides :json, for the javascript on the environments web form.
   def cb_versions
     provides :json
-    all_books = fetch_cookbook_versions(@num_versions)
+    use_envs = session[:environment] && !params[:ignore_environments]
+    num_versions = params[:num_versions] || "all"
+    all_books = fetch_cookbook_versions(num_versions, use_envs)
     display({ cookbook_id => all_books[cookbook_id] })
   end
 
 
@@ -5,26 +5,35 @@ function jQuerySuggest(timestamp){
 }
 
 function populateVersionBoxContent(timestamp, cb_name){
-  $.getJSON('/cookbooks/'+cb_name, function(result){
-                                     jQuery('#cookbook_version_'+timestamp).suggest(result[cb_name]);
+  // Ignore environments when editing the environments constraints
+  $.getJSON('/cookbooks/'+cb_name+'?num_versions=all&ignore_environments=true',
+            function(result){
+              console.log("result");
+              console.log(result);
+              var versions = $.map(result[cb_name],
+                                   function(item, i) {
+                                     return item["version"];
                                    });
+              jQuery('#cookbook_version_'+timestamp).suggest(versions);
+            });
 }
 
 function clearVersionBox(box, timestamp){
   populateVersionBoxContent(timestamp, retrieveCbName(timestamp));
-  //if (box.value == "0.0.0"){box.value = "";}
   error_message = document.getElementById('inline_error_message_' + timestamp);
   if (error_message != null)
     $(error_message).remove();
 }
 
 function validateVersionBoxValue(box, timestamp){
-  if (box.value.match(/^\d+\.\d+\.\d+$/) == null){
+  setTimeout(function() {
+  if (box.value.match(/^[0-9]+\.[0-9]+\.[0-9]+$/) == null){
     if (box.value.length != 0 && document.getElementById('inline_error_message_' + timestamp) == null)
-      $(box).parent().append('<span class="inline_error_message" id="inline_error_message_' + timestamp + '" >Invalid version format. The version should be in the format of 0.0.0.</span>');
+      $(box).parent().append('<span class="inline_error_message" id="inline_error_message_' + timestamp + '" >Invalid version format. The version should be in the format of x.y.z.</span>');
       if (box.value.length==0)
         box.value = "0.0.0";
   }
+  }, 100);
 }
 
 function buildCookbookList(cookbook_names, default_cookbook){
@@ -75,4 +84,4 @@ function addTableRow(default_cookbook, default_operator, default_version){
 
 function removeTableRow(row){
     row.remove();
-}
+}