raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-01 02:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3799 from idanceinbetween/product-description-field-text-formatting-3757

Browse Source 
added buttons to form and updated sanitizer to allow extra formatting
This commit is contained in:
Luis Ramos
2019-05-10 10:48:55 +01:00
committed by GitHub
parent 50ca1f7173 77178ca595
commit f844ff275b
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/products/products.js.coffee
View File

@@ -1 +1 @@
angular.module("admin.products", ["textAngular", "admin.utils"])
angular.module("admin.products", ["textAngular", "admin.utils"])

2
app/serializers/api/product_serializer.rb
View File

@@ -55,7 +55,7 @@ class Api::CachedProductSerializer < ActiveModel::Serializer
#return a sanitized html description
def description_html
d = sanitize(object.description, tags: "p, b, strong, em, i")
d = sanitize(object.description, tags: "p, b, strong, em, i, a, u", attributes: "href, target")
d.to_s.html_safe
end

2
app/views/spree/admin/products/_form.html.haml
View File

@@ -12,7 +12,7 @@
= f.field_container :description do
= f.label :description, t(:description)
%text-angular{'id' => 'product_description', 'name' => 'product[description]', 'class' => 'text-angular', 'textangular-strip' => true, 'ta-paste' => "stripFormatting($html)", 'ta-toolbar' => "[['bold','italics','clear']]"}
%text-angular{'id' => 'product_description', 'name' => 'product[description]', 'class' => 'text-angular', "textangular-links-target-blank" => true, 'ta-toolbar' => "[['bold','italics','underline','clear'],['insertLink']]"}
= sanitize(@product.description)
= f.error_message_on :description

2
app/views/spree/admin/products/new.html.haml
View File

@@ -76,7 +76,7 @@
= f.field_container :description do
= f.label :product_description, t(:product_description)
%br/
%text-angular{'id' => 'product_description', 'name' => 'product[description]', 'class' => 'text-angular', 'textangular-strip' => true, 'ta-paste' => "stripFormatting($html)", 'ta-toolbar' => "[['bold','italics','clear']]"}
%text-angular{'id' => 'product_description', 'name' => 'product[description]', 'class' => 'text-angular', "textangular-links-target-blank" => true, 'ta-toolbar' => "[['bold','italics','underline','clear'],['insertLink']]"}
= f.error_message_on :description
.four.columns.omega{ style: "text-align: center" }
%fieldset.no-border-bottom{ id: "image" }