Skip to content

Commit 0d380c6

Browse files
manuelleducmanuelleduc
committed
XWIKI-23169: The pages created by an user with script right viewed from the link from the 'Delete user' modal are not filtered properly anymore
1 parent bce03c0 commit 0d380c6

File tree

3 files changed

+186
-4
lines changed

3 files changed

+186
-4
lines changed

‎xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminUsersSheet.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,7 @@
250250
{{html}}
251251
#set ($pageIndexReference = $services.model.createDocumentReference(
252252
$userReference.wikiReference.name, 'Main', 'AllDocs'))
253-
#set ($pageIndexURL = $xwiki.getURL($pageIndexReference) + '#|t=alldocs&doc.author=' +
254-
$escapetool.url($services.model.serialize($userReference, 'local')))
253+
#set ($pageIndexURL = $xwiki.getURL($pageIndexReference, 'view', "doc.author=${escapetool.url($services.model.serialize($userReference, 'local'))}"))
255254
#set ($translationKey = "administration.section.users.deleteUser.${right}RightsWarning")
256255
$services.localization.render($translationKey, ["<a href='$pageIndexURL'>", $pageCount, '</a>'])
257256
<dl>

‎xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/XWiki/DocumentsMacro.xml

+178
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,13 @@ Generates:
307307
#set ($limit = $services.rendering.escape($xcontext.macro.params.count, 'xwiki/2.1'))
308308
#end
309309
#set ($propertiesStr = $services.rendering.escape($stringtool.join($properties, ','), 'xwiki/2.1'))
310+
#set ($filters = $xcontext.macro.params.filters)
310311
{{liveData
311312
id="$livedataId"
312313
properties="$propertiesStr"
313314
source="liveTable"
314315
sourceParameters="$escapetool.url($sourceParameters)"
316+
#if ($filters) filters="$filters"#end
315317
#if ($description != '')description="$description"#end
316318
#if ($properties.contains('doc.location'))sort="doc.location"#end
317319
#if ($limit != '')limit="$limit"#end
@@ -1071,4 +1073,180 @@ Generates:
10711073
<type/>
10721074
</property>
10731075
</object>
1076+
<object>
1077+
<name>XWiki.DocumentsMacro</name>
1078+
<number>8</number>
1079+
<className>XWiki.WikiMacroParameterClass</className>
1080+
<guid>ef5dfd9f-aeb1-495b-8621-4acbeaf73637</guid>
1081+
<class>
1082+
<name>XWiki.WikiMacroParameterClass</name>
1083+
<customClass/>
1084+
<customMapping/>
1085+
<defaultViewSheet/>
1086+
<defaultEditSheet/>
1087+
<defaultWeb/>
1088+
<nameField/>
1089+
<validationScript/>
1090+
<advanced>
1091+
<disabled>0</disabled>
1092+
<displayFormType>select</displayFormType>
1093+
<displayType>yesno</displayType>
1094+
<name>advanced</name>
1095+
<number>9</number>
1096+
<prettyName>Parameter advanced</prettyName>
1097+
<unmodifiable>0</unmodifiable>
1098+
<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
1099+
</advanced>
1100+
<defaultValue>
1101+
<disabled>0</disabled>
1102+
<name>defaultValue</name>
1103+
<number>4</number>
1104+
<prettyName>Parameter default value</prettyName>
1105+
<size>30</size>
1106+
<unmodifiable>0</unmodifiable>
1107+
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
1108+
</defaultValue>
1109+
<deprecated>
1110+
<disabled>0</disabled>
1111+
<displayFormType>select</displayFormType>
1112+
<displayType>yesno</displayType>
1113+
<name>deprecated</name>
1114+
<number>10</number>
1115+
<prettyName>Parameter deprecated</prettyName>
1116+
<unmodifiable>0</unmodifiable>
1117+
<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
1118+
</deprecated>
1119+
<description>
1120+
<disabled>0</disabled>
1121+
<name>description</name>
1122+
<number>2</number>
1123+
<prettyName>Parameter description</prettyName>
1124+
<restricted>0</restricted>
1125+
<rows>5</rows>
1126+
<size>40</size>
1127+
<unmodifiable>0</unmodifiable>
1128+
<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
1129+
</description>
1130+
<feature>
1131+
<disabled>0</disabled>
1132+
<name>feature</name>
1133+
<number>6</number>
1134+
<prettyName>Parameter feature</prettyName>
1135+
<size>30</size>
1136+
<unmodifiable>0</unmodifiable>
1137+
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
1138+
</feature>
1139+
<featureMandatory>
1140+
<disabled>0</disabled>
1141+
<displayFormType>select</displayFormType>
1142+
<displayType>yesno</displayType>
1143+
<name>featureMandatory</name>
1144+
<number>11</number>
1145+
<prettyName>Parameter feature mandatory</prettyName>
1146+
<unmodifiable>0</unmodifiable>
1147+
<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
1148+
</featureMandatory>
1149+
<group>
1150+
<cache>0</cache>
1151+
<disabled>0</disabled>
1152+
<displayType>input</displayType>
1153+
<freeText>allowed</freeText>
1154+
<largeStorage>0</largeStorage>
1155+
<multiSelect>1</multiSelect>
1156+
<name>group</name>
1157+
<number>7</number>
1158+
<picker>1</picker>
1159+
<prettyName>Parameter group property</prettyName>
1160+
<relationalStorage>0</relationalStorage>
1161+
<separator>|</separator>
1162+
<separators>|</separators>
1163+
<size>1</size>
1164+
<unmodifiable>0</unmodifiable>
1165+
<values/>
1166+
<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
1167+
</group>
1168+
<hidden>
1169+
<disabled>0</disabled>
1170+
<displayFormType>select</displayFormType>
1171+
<displayType>yesno</displayType>
1172+
<name>hidden</name>
1173+
<number>8</number>
1174+
<prettyName>Parameter hidden</prettyName>
1175+
<unmodifiable>0</unmodifiable>
1176+
<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
1177+
</hidden>
1178+
<mandatory>
1179+
<disabled>0</disabled>
1180+
<displayFormType>select</displayFormType>
1181+
<displayType>yesno</displayType>
1182+
<name>mandatory</name>
1183+
<number>3</number>
1184+
<prettyName>Parameter mandatory</prettyName>
1185+
<unmodifiable>0</unmodifiable>
1186+
<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
1187+
</mandatory>
1188+
<name>
1189+
<disabled>0</disabled>
1190+
<name>name</name>
1191+
<number>1</number>
1192+
<prettyName>Parameter name</prettyName>
1193+
<size>30</size>
1194+
<unmodifiable>0</unmodifiable>
1195+
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
1196+
</name>
1197+
<type>
1198+
<cache>0</cache>
1199+
<defaultValue>Unknown</defaultValue>
1200+
<disabled>0</disabled>
1201+
<displayType>input</displayType>
1202+
<freeText>allowed</freeText>
1203+
<largeStorage>1</largeStorage>
1204+
<multiSelect>0</multiSelect>
1205+
<name>type</name>
1206+
<number>5</number>
1207+
<picker>1</picker>
1208+
<prettyName>Parameter type</prettyName>
1209+
<relationalStorage>0</relationalStorage>
1210+
<separator>|</separator>
1211+
<separators>|</separators>
1212+
<size>1</size>
1213+
<unmodifiable>0</unmodifiable>
1214+
<values>Unknown|Wiki</values>
1215+
<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
1216+
</type>
1217+
</class>
1218+
<property>
1219+
<advanced>1</advanced>
1220+
</property>
1221+
<property>
1222+
<defaultValue/>
1223+
</property>
1224+
<property>
1225+
<deprecated/>
1226+
</property>
1227+
<property>
1228+
<description>Provide a default filter to apply in the documents Live Data</description>
1229+
</property>
1230+
<property>
1231+
<feature/>
1232+
</property>
1233+
<property>
1234+
<featureMandatory/>
1235+
</property>
1236+
<property>
1237+
<group/>
1238+
</property>
1239+
<property>
1240+
<hidden/>
1241+
</property>
1242+
<property>
1243+
<mandatory>0</mandatory>
1244+
</property>
1245+
<property>
1246+
<name>filters</name>
1247+
</property>
1248+
<property>
1249+
<type>Unknown</type>
1250+
</property>
1251+
</object>
10741252
</xwikidoc>

‎xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/src/main/resources/XWiki/Tableview.xml

+7-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
2121
-->
2222

23-
<xwikidoc version="1.3" reference="XWiki.Tableview" locale="">
23+
<xwikidoc version="1.6" reference="XWiki.Tableview" locale="">
2424
<web>XWiki</web>
2525
<name>Tableview</name>
2626
<language/>
@@ -36,5 +36,10 @@
3636
<minorEdit>false</minorEdit>
3737
<syntaxId>xwiki/2.0</syntaxId>
3838
<hidden>true</hidden>
39-
<content>{{documents id="alldocs"/}}</content>
39+
<content>{{velocity}}
40+
#set ($author = "$!request.getParameter('doc.author')")
41+
{{documents id="alldocs"
42+
#if($author != '')filters="doc.author=${services.rendering.escape($author, 'xwiki/2.1')}"#end
43+
/}}
44+
{{/velocity}}</content>
4045
</xwikidoc>

0 commit comments

Comments
 (0)