Added validation on "Price" field

Fixed to show label on Price field appropriately when adding new record, and fixed saving of new record when currency/price are both not entered by user.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1602072

app/controllers/catalog_controller.rb

@@ -1123,7 +1123,7 @@ def set_form_vars
     @edit[:new][:zone_id] = @record.zone_id
 
     @edit[:new][:currency] = @record.currency ? @record.currency.id : nil
-    @edit[:new][:code_currency] = code_currency_label(@record.currency.id) if @record.currency
+    @edit[:new][:code_currency] = @record.currency ? code_currency_label(@record.currency.id) : _("Price / Month")
     @edit[:new][:price] = @record.price
 
     # initialize fqnames
@@ -1269,7 +1269,7 @@ def get_form_vars
     @available_catalogs = available_catalogs.sort # Get available catalogs with tenants and ancestors
     @additional_tenants = @edit[:new][:tenant_ids].map(&:to_s) # Get ids of selected Additional Tenants in the Tenants tree
 
-    if params[:currency]
+    unless params[:currency].blank?
       @edit[:new][:currency] = params[:currency].to_i
       @edit[:new][:code_currency] = code_currency_label(params[:currency])
     end
@@ -2016,8 +2016,14 @@ def validate_price
     if @edit[:new][:currency] && @edit[:new][:price].blank?
       add_flash(_("Price / Month is required"), :error)
     end
+    add_flash(_("Price must be a numeric value"), :error) unless is_float_value(@edit[:new][:price])
   end
 
+  def is_float_value(fl)
+   fl =~ /(^(\d+)(\.)?(\d+)?)|(^(\d+)?(\.)(\d+))/
+  end
+
+
   def x_edit_tags_reset(db)
     @tagging = session[:tag_db] = db
     checked_ids = find_checked_items.empty? ? [params[:id]] : find_checked_items

app/views/catalog/_st_angular_form.html.haml

@@ -99,10 +99,13 @@
                                 "ng-model"    => "vm.catalogItemModel.price",
                                 "ng-change"   => "vm.priceRequired()",
                                 "ng-required" => "vm.priceRequired()",
+                                "ng-pattern"  => "/(^([0-9]+)(\.)?([0-9]+)?)|(^([0-9]+)?(\.)([0-9]+))/",
                                 "maxlength"   => 60,
                                 "checkchange" => ""}
           %span.help-block{"ng-show" => "vm.priceRequired()"}
             = _("Required")
+          %span.help-block{"ng-show" => "angularForm.price.$error.pattern"}
+            = _("Must be a numeric value")
 
     = render :partial => "layouts/angular/multi_tab_ansible_form_options",
              :locals  => {:record => @record, :ng_model => "vm.catalogItemModel"}