Changes for page api

Last modified by Ophion Admin on 2026/10/06 19:32

From version 4.1
edited by Ophion Admin
on 2026/10/06 16:02
Change comment: There is no comment for this version
To version 2.1
edited by Ophion Admin
on 2026/10/06 15:59
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,6 +1,7 @@
1 1  {{velocity}}
2 2  #set ($appSpace = 'api')
3 3  #set ($appClass = 'api.Code.apiClass')
4 +#set ($templateRef = 'api.Code.apiTemplate')
4 4  ## Lowercase letters and digits, single hyphens only between the parts
5 5  #set ($namePattern = '[a-z0-9]+(-[a-z0-9]+)*')
6 6  ## Collect all AWM apps: data class name -> app title
... ... @@ -20,9 +20,7 @@
20 20  #if ("$!request.createEntry" == '1')
21 21   #set ($name = "$!request.name")
22 22   #set ($sourceClass = "$!request.sourceClass")
23 - #if (!$services.csrf.isTokenValid("$!request.form_token"))
24 - #set ($errorMsg = 'Invalid form token, please try again.')
25 - #elseif (!$name.matches($namePattern))
24 + #if (!$name.matches($namePattern))
26 26   #set ($errorMsg = 'Only lowercase letters, digits and hyphens are allowed.')
27 27   #elseif (!$apps.containsKey($sourceClass))
28 28   #set ($errorMsg = 'Invalid source application.')
... ... @@ -31,14 +31,9 @@
31 31   #if ($xwiki.exists($ref))
32 32   #set ($errorMsg = "An API named '${name}' already exists.")
33 33   #else
34 - ## Create and save the entry directly, no edit form needed
35 - #set ($newDoc = $xwiki.getDocument($ref))
36 - #set ($discard = $newDoc.setTitle($name))
37 - #set ($discard = $newDoc.setParent("${appSpace}.WebHome"))
38 - #set ($newObj = $newDoc.newObject($appClass))
39 - #set ($discard = $newObj.set('sourceClass', $sourceClass))
40 - #set ($discard = $newDoc.save('Created API entry'))
41 - $response.sendRedirect($doc.getURL())
33 + ## The last parameter prefills the sourceClass field of the new entry
34 + #set ($qs = $escapetool.url({'template': $templateRef, 'parent': "${appSpace}.WebHome", 'title': $name, "${appClass}_0_sourceClass": $sourceClass}))
35 + $response.sendRedirect($xwiki.getURL($ref, 'edit', $qs))
42 42   #end
43 43   #end
44 44  #end
... ... @@ -50,9 +50,8 @@
50 50   /* Hide the default AWM "Add new entry" button */
51 51   ul.actions a.action.add, a.action.add { display: none !important; }
52 52  </style>
53 -<form action="$doc.getURL()" method="post" class="form-inline">
47 +<form action="$doc.getURL()" method="get" class="form-inline">
54 54   <input type="hidden" name="createEntry" value="1"/>
55 - <input type="hidden" name="form_token" value="$!services.csrf.token"/>
56 56   <select name="sourceClass" class="form-control">
57 57   #foreach ($app in $apps.entrySet())
58 58   <option value="$escapetool.xml($app.key)">$escapetool.xml($app.value)</option>
... ... @@ -68,7 +68,6 @@
68 68  {{velocity}}
69 69  #set ($columnsProperties = {
70 70   'doc.title': {"link":"view"},
71 - 'sourceClass': {},
72 72   'doc.location': {"html":true},
73 73   'doc.date': {},
74 74   'doc.author': {"link":"author"},
... ... @@ -83,6 +83,6 @@
83 83   'selectedColumn': 'doc.title',
84 84   'defaultOrder': 'asc'
85 85  })
86 -#set ($columns = ['doc.title', 'sourceClass', 'doc.location', 'doc.date', 'doc.author', '_actions'])
78 +#set ($columns = ['doc.title', 'doc.location', 'doc.date', 'doc.author', '_actions'])
87 87  #livetable('api' $columns $columnsProperties $options)
88 88  {{/velocity}}