Merge pull request #70 from plone/es6-pat-contentrules

move contentrules js into mockup/pat/controlpanels
plone · Mar 24, 2022 · f1f8352 · f1f8352
2 parents 97fccc1 + 86b8420
commit f1f8352
Show file tree

Hide file tree

Showing 14 changed files with 574 additions and 897 deletions.
diff --git a/news/70-2.breaking b/news/70-2.breaking
@@ -0,0 +1,2 @@
+Remove handling of Archetypes and portal_factory.
+[pbauer]
diff --git a/news/70.breaking b/news/70.breaking
@@ -0,0 +1,2 @@
+Improve management UI and move JS to mockup es6.
+[agitator, MrTango]
diff --git a/plone/app/contentrules/browser/configure.zcml b/plone/app/contentrules/browser/configure.zcml
@@ -183,21 +183,6 @@
 
     </configure>
 
-    <!-- Resources -->
-    <browser:resource
-        name="manage-contentrules.js"
-        file="contentrules.js"
-        />
-    <!-- Resources -->
-    <browser:resource
-        name="manage-contentrule-elements.js"
-        file="contentrule-elements.js"
-        />
-    <browser:resource
-        name="manage-contentrules.css"
-        file="contentrules.css"
-        />
-
     <!-- Rule breadcrumb -->
 
   <browser:page

diff --git a/plone/app/contentrules/browser/contentrule-elements.js b/plone/app/contentrules/browser/contentrule-elements.js
diff --git a/plone/app/contentrules/browser/contentrules.css b/plone/app/contentrules/browser/contentrules.css
diff --git a/plone/app/contentrules/browser/contentrules.js b/plone/app/contentrules/browser/contentrules.js
diff --git a/plone/app/contentrules/browser/elements.py b/plone/app/contentrules/browser/elements.py
@@ -161,7 +161,8 @@ def assignments(self):
                 'url': site.absolute_url(),
                 'title': site.title_or_id(),
                 'description': site.Description(),
-            })
+                'icon': 'plone-home'
+                })
 
         catalog = getToolByName(rule, 'portal_catalog')
         for a in catalog(path=dict(query=list(paths), depth=0),
@@ -170,7 +171,8 @@ def assignments(self):
                 'url': a.getURL(),
                 'title': a.Title or a.getId,
                 'description': a.Description,
-            })
+                'icon': f'contenttype/{a.portal_type.lower()}'
+                })
 
         return info
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Remove handling of Archetypes and portal_factory.
		[pbauer]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Improve management UI and move JS to mockup es6.
		[agitator, MrTango]