Skip to Content

Changes for page Main

Last modified by Administrator on 2023/03/27 10:53
From version 7.1
edited by Administrator
on 2023/02/09 10:20
Change comment: Install extension [org.xwiki.platform:xwiki-platform-appwithinminutes-ui/14.10.4]
To version 3.1
edited by Administrator
on 2020/01/07 18:45
Change comment: Install extension [org.xwiki.platform:xwiki-platform-appwithinminutes-ui/11.10.2]

Summary

Details

Page properties
Content
... ... @@ -66,7 +66,7 @@
66 66   #foreach ($category in $services.query.xwql($categoryListStatement).execute())
67 67   #set ($categoryDoc = $xwiki.getDocument($category))
68 68   <li>
69 - <div class="category">$escapetool.xml($categoryDoc.plainTitle)</div>
69 + <div class="category">$categoryDoc.plainTitle</div>
70 70   #set ($formFieldsForCategoryStatement = "from doc.object($formFieldClassName) as field where field.category = :category order by field.priority")
71 71   #set ($formFieldsForCategoryQuery = $services.query.xwql($formFieldsForCategoryStatement).bindValue('category', $category))
72 72   <ul>
... ... @@ -81,7 +81,7 @@
81 81   #else
82 82   #set ($formFieldIconURL = $formFieldDoc.getAttachmentURL($formFieldIcon))
83 83   #end
84 - #set ($formFieldIconRendered = "<img src='$escapetool.xml($formFieldIconURL)' alt='$escapetool.xml($formFieldDoc.plainTitle)' class='icon' />")
84 + #set ($formFieldIconRendered = "<img src='$formFieldIconURL' alt='$escapetool.xml($formFieldDoc.plainTitle)' class='icon' />")
85 85   #end
86 86   <li class="field">
87 87   $formFieldIconRendered
... ... @@ -97,11 +97,10 @@
97 97   #set ($fieldURL = $doc.getURL('edit', $escapetool.url({
98 98   'xpage': 'plain',
99 99   'sheet': 'AppWithinMinutes.ClassEditSheet',
100 - 'template': 'AppWithinMinutes.ClassTemplate',
101 101   'field': $formFieldDoc.fullName,
102 102   'xeditmode': 'text'
103 103   })))
104 - <input type="hidden" value="$escapetool.xml($fieldURL)" class="data"/>
103 + <input type="hidden" value="$fieldURL" class="data"/>
105 105   </li>
106 106   #end
107 107   </ul>
... ... @@ -388,6 +388,7 @@
388 388   * Display the edit class form.
389 389   *#
390 390  #macro (displayEditForm)
390 + #set ($discard = $xwiki.jsfx.use('js/scriptaculous/dragdrop.js'))
391 391   #set ($discard = $xwiki.jsx.use('AppWithinMinutes.ClassEditSheet'))
392 392   #set ($discard = $xwiki.ssx.use('AppWithinMinutes.ClassEditSheet'))
393 393   #set ($discard = $xwiki.ssx.use('AppWithinMinutes.ClassSheetGenerator'))
... ... @@ -437,7 +437,7 @@
437 437   #try()
438 438   #set ($discard = $copyAsJob.join())
439 439   #set ($copyAsJobStatus = $services.job.getJobStatus($copyAsJob.request.id))
440 - #set ($errorMessage = $copyAsJobStatus.logTail.getFirstLogEvent('ERROR').toString())
440 + #set ($errorMessage = $copyAsJobStatus.logTail.getFirstLogEvents('ERROR').toString())
441 441   #end
442 442   #end
443 443  #end
... ... @@ -617,10 +617,6 @@
617 617   #set($discard = $sheetDoc.setParent($doc.documentReference.name))
618 618   #set($discard = $sheetDoc.setContent($doc.getRenderedContent($sheetGeneratorDoc.content,
619 619   $sheetGeneratorDoc.syntax.toIdString(), 'plain/1.0')))
620 - ## We assume for now that the output produced by the sheet generator uses the same syntax as the code of the sheet
621 - ## generator. We have to set the syntax because the default wiki syntax (used when creating new wiki pages) could
622 - ## be different than the one used by the sheet generator.
623 - #set($discard = $sheetDoc.setSyntax($sheetGeneratorDoc.syntax))
624 624   #set($discard = $sheetDoc.setHidden(true))
625 625   #set($discard = $sheetDoc.save($services.localization.render('platform.appwithinminutes.classEditorSheetSaveComment'),
626 626   $minorEdit))
... ... @@ -646,7 +646,6 @@
646 646   #set($translationsGeneratorDoc = $xwiki.getDocument('AppWithinMinutes.ClassTranslationsGenerator'))
647 647   #set($discard = $translationsDoc.setContent($doc.getRenderedContent($translationsGeneratorDoc.content,
648 648   $translationsGeneratorDoc.syntax.toIdString(), 'plain/1.0')))
649 - #set($discard = $translationsDoc.setSyntaxId('plain/1.0'))
650 650   #set($discard = $translationsDoc.setHidden(true))
651 651   #set($discard = $translationsDoc.save(
652 652   $services.localization.render('platform.appwithinminutes.classEditorTranslationsSaveComment'),
XWiki.JavaScriptExtension[2]
Code
... ... @@ -515,7 +515,11 @@
515 515  }(XWiki || {}));
516 516  
517 517  (function() {
518 - function initForm(form) {
518 + function init() {
519 + var form = $('inline');
520 + if (!form) {
521 + return false;
522 + }
519 519   // Let the sheet handle the form submit. The form is submitted by default to the preview action which dispatches the
520 520   // request to the save action if the save button is detected on the request parameters. By submitting to the edit
521 521   // action the edit sheet is evaluated and thus it can handle the save by itself.
... ... @@ -553,18 +553,9 @@
553 553   // Make the palette and the canvas live.
554 554   new XWiki.FormFieldPalette('palette');
555 555   new XWiki.FormCanvas('canvas');
556 - }
557 557  
558 - function init() {
559 - var form = $('inline');
560 - if (form) {
561 - require(['scriptaculous/dragdrop'], function() {
562 - initForm(form);
563 - });
564 - }
565 - return form;
561 + return true;
566 566   }
567 -
568 568   (XWiki.domIsLoaded && init()) || document.observe('xwiki:dom:loaded', init);
569 569  }).call();
570 570