* do not filter portal_types of Web Site listbox (use allowed content type list)

* add portal_type column
reviewed by kazuhiko

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31596 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_view/listbox.xml

@@ -15,9 +15,7 @@
               <list>
                 <string>columns</string>
                 <string>editable_columns</string>
-                <string>lines</string>
                 <string>list_action</string>
-                <string>portal_types</string>
                 <string>selection_name</string>
                 <string>sort</string>
                 <string>title</string>
@@ -97,6 +95,10 @@
                           <string>title</string>
                           <string>Title</string>
                         </tuple>
+                        <tuple>
+                          <string>portal_type</string>
+                          <string>Portal Type</string>
+                        </tuple>
                         <tuple>
                           <string>modification_date</string>
                           <string>Modification Date</string>
@@ -131,29 +133,10 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewWebFieldLibrary</string> </value>
                 </item>
-                <item>
-                    <key> <string>lines</string> </key>
-                    <value> <int>10</int> </value>
-                </item>
                 <item>
                     <key> <string>list_action</string> </key>
                     <value> <string>Folder_viewContentList</string> </value>
                 </item>
-                <item>
-                    <key> <string>portal_types</string> </key>
-                    <value>
-                      <list>
-                        <tuple>
-                          <string>Web Section</string>
-                          <string>Web Section</string>
-                        </tuple>
-                        <tuple>
-                          <string>Web Container</string>
-                          <string>Web Container</string>
-                        </tuple>
-                      </list>
-                    </value>
-                </item>
                 <item>
                     <key> <string>selection_name</string> </key>
                     <value> <string>site_content_selection</string> </value>
@@ -162,6 +145,10 @@
                     <key> <string>sort</string> </key>
                     <value>
                       <list>
+                        <tuple>
+                          <string>portal_type</string>
+                          <string>Portal Type</string>
+                        </tuple>
                         <tuple>
                           <string>int_index</string>
                           <string>Index</string>

bt5/erp5_web/bt/revision

-878
\ No newline at end of file
+880
\ No newline at end of file