feat: Open folksonomies for all connected users (#10771)

Fix #10360 Will make some issues more annoying: * openfoodfacts/folksonomy_api#128 * #6169 --------- Co-authored-by: Open Food Facts Bot <[email protected]>
openfoodfacts · Sep 9, 2024 · 160b792 · 160b792
1 parent f3c84de
commit 160b792
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 3 deletions.
diff --git a/html/js/folksonomy.js b/html/js/folksonomy.js
@@ -155,8 +155,10 @@ function displayFolksonomyPropertyValues() {
         '<h2>Personalized properties (<span data-tooltip aria-haspopup="true" class="has-tip" data-position="top" data-alignment="left" title="Be aware the data model might be modified. Use at your own risk.">beta</span>)</h2>' +
         '<p id="fe_login_info"></p>' +
         "<p>These properties are created and filed by users for any kind of usages. Feel free to add your own. " +
+        "The properties and values you create <strong>must be factual</strong>. " +
         "You can dive into <a href='/properties'>the list of properties already used by the community</a> " +
-        "or explore the <a href='https://wiki.openfoodfacts.org/Folksonomy/Property'>properties' documentation and its search engine</a>.</p>" +
+        "or explore the <a href='https://wiki.openfoodfacts.org/Folksonomy/Property'>properties' documentation and its search engine</a>. " +
+        "</p>" +
         "<p>Be aware the data model might be modified. Use at your own risk.</p>" +
         "<p>This is brought by the <a href='https://wiki.openfoodfacts.org/Folksonomy_Engine'>folksonomy engine project</a>. Don't hesitate to participate or give feedback.</p>" +
         '<form id="free_properties_form">' +

diff --git a/templates/web/common/includes/folksonomy_script.tt.html b/templates/web/common/includes/folksonomy_script.tt.html
@@ -1,5 +1,5 @@
 <!-- start templates/[% component.name %] -->
-[% IF moderator %]
+[% IF user_id.defined %]
 <!-- Folksonomy Engine script -->
 <scripts>
     <script src="[% static_subdomain %]/js/folksonomy.js"></script>
@@ -8,4 +8,4 @@
     folskonomy_engine_init();
 </initjs>
 [% END %]
-<!-- end templates/[% component.name %] -->
+<!-- end templates/[% component.name %] -->
diff --git a/tests/integration/expected_test_results/page_crawler/crawler-access-product-page.html b/tests/integration/expected_test_results/page_crawler/crawler-access-product-page.html
@@ -3569,6 +3569,7 @@ <h2 id="data_sources" class="text-medium">Data sources</h2>
 
 <!-- end templates/web/common/includes/folksonomy_script.tt.html -->
 
+
 <!-- end templates/web/pages/product/product_page.tt.html -->
 
 					</div>

diff --git a/tests/integration/expected_test_results/page_crawler/normal-user-access-product-page.html b/tests/integration/expected_test_results/page_crawler/normal-user-access-product-page.html
@@ -3569,6 +3569,7 @@ <h2 id="data_sources" class="text-medium">Data sources</h2>
 
 <!-- end templates/web/common/includes/folksonomy_script.tt.html -->
 
+
 <!-- end templates/web/pages/product/product_page.tt.html -->
 
 					</div>

diff --git a/tests/integration/expected_test_results/product_read/get-existing-product.html b/tests/integration/expected_test_results/product_read/get-existing-product.html
@@ -4730,6 +4730,7 @@ <h2 id="data_sources" class="text-medium">Data sources</h2>
 
 <!-- end templates/web/common/includes/folksonomy_script.tt.html -->
 
+
 <!-- end templates/web/pages/product/product_page.tt.html -->
 
 					</div>

diff --git a/tests/integration/expected_test_results/web_html/fr-product-2.html b/tests/integration/expected_test_results/web_html/fr-product-2.html
@@ -3789,6 +3789,7 @@ <h2 id="data_sources" class="text-medium">Sources de données</h2>
 
 <!-- end templates/web/common/includes/folksonomy_script.tt.html -->
 
+
 <!-- end templates/web/pages/product/product_page.tt.html -->
 
 					</div>

diff --git a/tests/integration/expected_test_results/web_html/fr-product.html b/tests/integration/expected_test_results/web_html/fr-product.html
@@ -3803,6 +3803,7 @@ <h2 id="data_sources" class="text-medium">Sources de données</h2>
 
 <!-- end templates/web/common/includes/folksonomy_script.tt.html -->
 
+
 <!-- end templates/web/pages/product/product_page.tt.html -->
 
 					</div>

diff --git a/tests/integration/expected_test_results/web_html/world-product.html b/tests/integration/expected_test_results/web_html/world-product.html
@@ -4300,6 +4300,7 @@ <h2 id="data_sources" class="text-medium">Data sources</h2>
 
 <!-- end templates/web/common/includes/folksonomy_script.tt.html -->
 
+
 <!-- end templates/web/pages/product/product_page.tt.html -->
 
 					</div>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3569,6 +3569,7 @@ <h2 id="data_sources" class="text-medium">Data sources</h2>

		<!-- end templates/web/common/includes/folksonomy_script.tt.html -->


		<!-- end templates/web/pages/product/product_page.tt.html -->

		</div>
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4730,6 +4730,7 @@ <h2 id="data_sources" class="text-medium">Data sources</h2>

		<!-- end templates/web/common/includes/folksonomy_script.tt.html -->


		<!-- end templates/web/pages/product/product_page.tt.html -->

		</div>
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3789,6 +3789,7 @@ <h2 id="data_sources" class="text-medium">Sources de données</h2>

		<!-- end templates/web/common/includes/folksonomy_script.tt.html -->


		<!-- end templates/web/pages/product/product_page.tt.html -->

		</div>
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3803,6 +3803,7 @@ <h2 id="data_sources" class="text-medium">Sources de données</h2>

		<!-- end templates/web/common/includes/folksonomy_script.tt.html -->


		<!-- end templates/web/pages/product/product_page.tt.html -->

		</div>
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4300,6 +4300,7 @@ <h2 id="data_sources" class="text-medium">Data sources</h2>

		<!-- end templates/web/common/includes/folksonomy_script.tt.html -->


		<!-- end templates/web/pages/product/product_page.tt.html -->

		</div>
Expand Down