Skip to content

Commit 897dbf6

Browse files
Sereza7Sereza7
committed
XWIKI-19383: Display a title on createlink
* Fixed integration tests
1 parent 60c8c67 commit 897dbf6

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

‎xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/DefaultWantedLinkTitleGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* Generates wanted link titles for resource references.
3030
* Using this implementation should be avoided, another implementation should be used instead.
31-
* E.g. XWikiDocumentURITitleGenerator in xwiki-platform which is used to provide proper translations.
31+
* E.g. XWikiDocumentWantedLinkTitleGenerator in xwiki-platform which is used to provide translations.
3232
* This implementation is a fallback and should only be used when xwiki-rendering is running by itself.
3333
* This implementation uses the reference as the title.
3434
* @version $Id$

‎xwiki-rendering-integration-tests/src/test/resources/wiki/link/links20.test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ endDocument
1515
.#-----------------------------------------------------
1616
.expect|xhtml/1.0
1717
.#-----------------------------------------------------
18-
<p><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">\</span></a></span></p>
18+
<p><span class="wikicreatelink" title="Create resource: \"><a href="editurl"><span class="wikigeneratedlinkcontent">\</span></a></span></p>
1919
.#-----------------------------------------------------
2020
.expect|annotatedxhtml/1.0
2121
.#-----------------------------------------------------
22-
<p><!--startwikilink:false|-|doc|-|\\--><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">\</span></a></span><!--stopwikilink--></p>
22+
<p><!--startwikilink:false|-|doc|-|\\--><span class="wikicreatelink" title="Create resource: \"><a href="editurl"><span class="wikigeneratedlinkcontent">\</span></a></span><!--stopwikilink--></p>
2323
.#-----------------------------------------------------
2424
.expect|xwiki/2.0
2525
.#-----------------------------------------------------
2626
[[\]]
2727
.#-----------------------------------------------------
2828
.input|xhtml/1.0
2929
.#-----------------------------------------------------
30-
<p><!--startwikilink:false|-|doc|-|\\--><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">\</span></a></span><!--stopwikilink--></p>
30+
<p><!--startwikilink:false|-|doc|-|\\--><span class="wikicreatelink" title="Create resource: \"><a href="editurl"><span class="wikigeneratedlinkcontent">\</span></a></span><!--stopwikilink--></p>

‎xwiki-rendering-integration-tests/src/test/resources/wiki/link/links22.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
.#-----------------------------------------------------
77
.expect|xhtml/1.0
88
.#-----------------------------------------------------
9-
<p><span class="wikicreatelink"><a href="editurl">label</a></span></p>
9+
<p><span class="wikicreatelink" title="Create resource: Spa ce.Pa ge "><a href="editurl">label</a></span></p>

‎xwiki-rendering-integration-tests/src/test/resources/wiki/link/links3.test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ endDocument
1515
.#-----------------------------------------------------
1616
.expect|xhtml/1.0
1717
.#-----------------------------------------------------
18-
<p><span class="wikicreatelink"><a href="editurl">label</a></span></p>
18+
<p><span class="wikicreatelink" title="Create resource: Space.UnknownPage"><a href="editurl">label</a></span></p>
1919
.#-----------------------------------------------------
2020
.expect|annotatedxhtml/1.0
2121
.#-----------------------------------------------------
22-
<p><!--startwikilink:false|-|doc|-|Space.UnknownPage--><span class="wikicreatelink"><a href="editurl">label</a></span><!--stopwikilink--></p>
22+
<p><!--startwikilink:false|-|doc|-|Space.UnknownPage--><span class="wikicreatelink" title="Create resource: Space.UnknownPage"><a href="editurl">label</a></span><!--stopwikilink--></p>
2323
.#-----------------------------------------------------
2424
.expect|xwiki/2.0
2525
.#-----------------------------------------------------
2626
[[label>>Space.UnknownPage]]
2727
.#-----------------------------------------------------
2828
.input|xhtml/1.0
2929
.#-----------------------------------------------------
30-
<p><!--startwikilink:false|-|doc|-|Space.UnknownPage--><span class="wikicreatelink"><a href="editurl">label</a></span><!--stopwikilink--></p>
30+
<p><!--startwikilink:false|-|doc|-|Space.UnknownPage--><span class="wikicreatelink" title="Create resource: Space.UnknownPage"><a href="editurl">label</a></span><!--stopwikilink--></p>
3131
.#-----------------------------------------------------
3232
.expect|plain/1.0
3333
.#-----------------------------------------------------

‎xwiki-rendering-integration-tests/src/test/resources/wiki/link/links6.test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ endDocument
5151
.#-----------------------------------------------------
5252
.expect|xhtml/1.0
5353
.#-----------------------------------------------------
54-
<p><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">&#123;&#123;macro}}</span></a></span><br/><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">Label&gt;Reference</span></a></span><br/><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">Reference|Param=Value</span></a></span><br/><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">[[no link</span></a></span>&gt;&gt;Not Reference]]<br/><span class="wikicreatelink"><a href="editurl">[[<img src="imageurl" class="wikimodel-freestanding wikigeneratedid" id="Iwhatever" alt="whatever"/></a></span><br/>not:link</p>
54+
<p><span class="wikicreatelink" title="Create resource: &#123;&#123;macro}}"><a href="editurl"><span class="wikigeneratedlinkcontent">&#123;&#123;macro}}</span></a></span><br/><span class="wikicreatelink" title="Create resource: Label&gt;Reference"><a href="editurl"><span class="wikigeneratedlinkcontent">Label&gt;Reference</span></a></span><br/><span class="wikicreatelink" title="Create resource: Reference|Param=Value"><a href="editurl"><span class="wikigeneratedlinkcontent">Reference|Param=Value</span></a></span><br/><span class="wikicreatelink" title="Create resource: [[no link"><a href="editurl"><span class="wikigeneratedlinkcontent">[[no link</span></a></span>&gt;&gt;Not Reference]]<br/><span class="wikicreatelink" title="Create resource: Reference"><a href="editurl">[[<img src="imageurl" class="wikimodel-freestanding wikigeneratedid" id="Iwhatever" alt="whatever"/></a></span><br/>not:link</p>
5555
.#-----------------------------------------------------
5656
.expect|annotatedxhtml/1.0
5757
.#-----------------------------------------------------
58-
<p><!--startwikilink:false|-|doc|-|\{\{macro}}--><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">&#123;&#123;macro}}</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Label>Reference--><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">Label&gt;Reference</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Reference|Param=Value--><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">Reference|Param=Value</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|[[no link--><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">[[no link</span></a></span><!--stopwikilink-->&gt;&gt;Not Reference]]<br/><!--startwikilink:false|-|doc|-|Reference--><span class="wikicreatelink"><a href="editurl">[[<!--startimage:false|-|attach|-|whatever--><img src="imageurl" class="wikimodel-freestanding wikigeneratedid" id="Iwhatever" alt="whatever"/><!--stopimage--></a></span><!--stopwikilink--><br/>not:link</p>
58+
<p><!--startwikilink:false|-|doc|-|\{\{macro}}--><span class="wikicreatelink" title="Create resource: &#123;&#123;macro}}"><a href="editurl"><span class="wikigeneratedlinkcontent">&#123;&#123;macro}}</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Label>Reference--><span class="wikicreatelink" title="Create resource: Label&gt;Reference"><a href="editurl"><span class="wikigeneratedlinkcontent">Label&gt;Reference</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Reference|Param=Value--><span class="wikicreatelink" title="Create resource: Reference|Param=Value"><a href="editurl"><span class="wikigeneratedlinkcontent">Reference|Param=Value</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|[[no link--><span class="wikicreatelink" title="Create resource: [[no link"><a href="editurl"><span class="wikigeneratedlinkcontent">[[no link</span></a></span><!--stopwikilink-->&gt;&gt;Not Reference]]<br/><!--startwikilink:false|-|doc|-|Reference--><span class="wikicreatelink" title="Create resource: Reference"><a href="editurl">[[<!--startimage:false|-|attach|-|whatever--><img src="imageurl" class="wikimodel-freestanding wikigeneratedid" id="Iwhatever" alt="whatever"/><!--stopimage--></a></span><!--stopwikilink--><br/>not:link</p>
5959
.#-----------------------------------------------------
6060
.expect|xwiki/2.0
6161
.#-----------------------------------------------------
@@ -68,4 +68,4 @@ not:link
6868
.#-----------------------------------------------------
6969
.input|xhtml/1.0
7070
.#-----------------------------------------------------
71-
<p><!--startwikilink:false|-|doc|-|{{macro}}--><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">&#123;&#123;macro}}</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Label>Reference--><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">Label&gt;Reference</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Reference|Param=Value--><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">Reference|Param=Value</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|[[no link--><span class="wikicreatelink"><a href="editurl"><span class="wikigeneratedlinkcontent">[[no link</span></a></span><!--stopwikilink-->&gt;&gt;Not Reference]]<br/><!--startwikilink:false|-|doc|-|Reference--><span class="wikicreatelink"><a href="editurl">[[<!--startimage:false|-|attach|-|whatever--><img src="imageurl" class="wikimodel-freestanding wikigeneratedid" id="Iwhatever" alt="whatever"/><!--stopimage--></a></span><!--stopwikilink--><br/>not:link</p>
71+
<p><!--startwikilink:false|-|doc|-|{{macro}}--><span class="wikicreatelink" title="Create resource: &#123;&#123;macro}}"><a href="editurl"><span class="wikigeneratedlinkcontent">&#123;&#123;macro}}</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Label>Reference--><span class="wikicreatelink" title="Create resource: Label&gt;Reference"><a href="editurl"><span class="wikigeneratedlinkcontent">Label&gt;Reference</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Reference|Param=Value--><span class="wikicreatelink" title="Create resource: Reference|Param=Value"><a href="editurl"><span class="wikigeneratedlinkcontent">Reference|Param=Value</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|[[no link--><span class="wikicreatelink" title="Create resource: [[no link"><a href="editurl"><span class="wikigeneratedlinkcontent">[[no link</span></a></span><!--stopwikilink-->&gt;&gt;Not Reference]]<br/><!--startwikilink:false|-|doc|-|Reference--><span class="wikicreatelink" title="Create resource: Reference"><a href="editurl">[[<!--startimage:false|-|attach|-|whatever--><img src="imageurl" class="wikimodel-freestanding wikigeneratedid" id="Iwhatever" alt="whatever"/><!--stopimage--></a></span><!--stopwikilink--><br/>not:link</p>

‎xwiki-rendering-integration-tests/src/test/resources/wiki/link/links7.test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ endDocument
2929
.#-----------------------------------------------------
3030
.expect|xhtml/1.0
3131
.#-----------------------------------------------------
32-
<p><span class="wikicreatelink"><a href="editurl"><strong>hello</strong></a></span><br/><span class="wikicreatelink"><a href="editurl">= notheader</a></span><br/><span class="wikicreatelink"><a href="editurl"></a></span></p>
32+
<p><span class="wikicreatelink" title="Create resource: Page"><a href="editurl"><strong>hello</strong></a></span><br/><span class="wikicreatelink" title="Create resource: Page"><a href="editurl">= notheader</a></span><br/><span class="wikicreatelink" title="Create resource: Page"><a href="editurl"></a></span></p>
3333
.#-----------------------------------------------------
3434
.expect|annotatedxhtml/1.0
3535
.#-----------------------------------------------------
36-
<p><!--startwikilink:false|-|doc|-|Page--><span class="wikicreatelink"><a href="editurl"><strong>hello</strong></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Page--><span class="wikicreatelink"><a href="editurl">= notheader</a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Page--><span class="wikicreatelink"><a href="editurl"><!--startmacro:testsimplemacro|-||-|label--><!--stopmacro--></a></span><!--stopwikilink--></p>
36+
<p><!--startwikilink:false|-|doc|-|Page--><span class="wikicreatelink" title="Create resource: Page"><a href="editurl"><strong>hello</strong></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Page--><span class="wikicreatelink" title="Create resource: Page"><a href="editurl">= notheader</a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Page--><span class="wikicreatelink" title="Create resource: Page"><a href="editurl"><!--startmacro:testsimplemacro|-||-|label--><!--stopmacro--></a></span><!--stopwikilink--></p>
3737
.#-----------------------------------------------------
3838
.expect|xwiki/2.0
3939
.#-----------------------------------------------------
@@ -43,4 +43,4 @@ endDocument
4343
.#-----------------------------------------------------
4444
.input|xhtml/1.0
4545
.#-----------------------------------------------------
46-
<p><!--startwikilink:false|-|doc|-|Page--><span class="wikicreatelink"><a href="editurl"><strong>hello</strong></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Page--><span class="wikicreatelink"><a href="editurl">= notheader</a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Page--><span class="wikicreatelink"><a href="editurl"><!--startmacro:testsimplemacro|-||-|label--><!--stopmacro--></a></span><!--stopwikilink--></p>
46+
<p><!--startwikilink:false|-|doc|-|Page--><span class="wikicreatelink" title="Create resource: Page"><a href="editurl"><strong>hello</strong></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Page--><span class="wikicreatelink" title="Create resource: Page"><a href="editurl">= notheader</a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Page--><span class="wikicreatelink" title="Create resource: Page"><a href="editurl"><!--startmacro:testsimplemacro|-||-|label--><!--stopmacro--></a></span><!--stopwikilink--></p>

‎xwiki-rendering-integration-tests/src/test/resources/wiki/link/links8.test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ endDocument
1919
.#-----------------------------------------------------
2020
.expect|xhtml/1.0
2121
.#-----------------------------------------------------
22-
<p><span class="wikilink"><a data-xwiki-translated-attribute-param1="value1" data-xwiki-translated-attribute-param2="value2" href="viewurl"><span class="wikigeneratedlinkcontent">Space.ExistingPage</span></a></span><br/><span class="wikicreatelink"><a data-xwiki-translated-attribute-param="value" href="editurl">label</a></span></p>
22+
<p><span class="wikilink"><a data-xwiki-translated-attribute-param1="value1" data-xwiki-translated-attribute-param2="value2" href="viewurl"><span class="wikigeneratedlinkcontent">Space.ExistingPage</span></a></span><br/><span class="wikicreatelink" title="Create resource: Space.UnknownPage"><a data-xwiki-translated-attribute-param="value" href="editurl">label</a></span></p>
2323
.#-----------------------------------------------------
2424
.expect|annotatedxhtml/1.0
2525
.#-----------------------------------------------------
26-
<p><!--startwikilink:false|-|doc|-|Space.ExistingPage--><span class="wikilink"><a data-xwiki-translated-attribute-param1="value1" data-xwiki-translated-attribute-param2="value2" href="viewurl"><span class="wikigeneratedlinkcontent">Space.ExistingPage</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Space.UnknownPage--><span class="wikicreatelink"><a data-xwiki-translated-attribute-param="value" href="editurl">label</a></span><!--stopwikilink--></p>
26+
<p><!--startwikilink:false|-|doc|-|Space.ExistingPage--><span class="wikilink"><a data-xwiki-translated-attribute-param1="value1" data-xwiki-translated-attribute-param2="value2" href="viewurl"><span class="wikigeneratedlinkcontent">Space.ExistingPage</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Space.UnknownPage--><span class="wikicreatelink" title="Create resource: Space.UnknownPage"><a data-xwiki-translated-attribute-param="value" href="editurl">label</a></span><!--stopwikilink--></p>
2727
.#-----------------------------------------------------
2828
.expect|xwiki/2.0
2929
.#-----------------------------------------------------
@@ -32,4 +32,4 @@ endDocument
3232
.#-----------------------------------------------------
3333
.input|xhtml/1.0
3434
.#-----------------------------------------------------
35-
<p><!--startwikilink:false|-|doc|-|Space.ExistingPage--><span class="wikilink"><a data-xwiki-translated-attribute-param1="value1" data-xwiki-translated-attribute-param2="value2" href="viewurl"><span class="wikigeneratedlinkcontent">Space.ExistingPage</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Space.UnknownPage--><span class="wikicreatelink"><a data-xwiki-translated-attribute-param="value" href="editurl">label</a></span><!--stopwikilink--></p>
35+
<p><!--startwikilink:false|-|doc|-|Space.ExistingPage--><span class="wikilink"><a data-xwiki-translated-attribute-param1="value1" data-xwiki-translated-attribute-param2="value2" href="viewurl"><span class="wikigeneratedlinkcontent">Space.ExistingPage</span></a></span><!--stopwikilink--><br/><!--startwikilink:false|-|doc|-|Space.UnknownPage--><span class="wikicreatelink" title="Create resource: Space.UnknownPage"><a data-xwiki-translated-attribute-param="value" href="editurl">label</a></span><!--stopwikilink--></p>

0 commit comments

Comments
 (0)