Update GlossarySheet.xml #3
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,41 @@ | ||
| <?xml version="1.1" encoding="UTF-8"?> | ||
| <!-- | ||
| * See the NOTICE file distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| --> | ||
| <xwikidoc version="1.4" reference="Glossary.Code.GlossarySheet" locale=""> | ||
| <web>Glossary.Code</web> | ||
| <name>GlossarySheet</name> | ||
| <language/> | ||
| <defaultLanguage/> | ||
| <translation>0</translation> | ||
| <creator>xwiki:XWiki.Admin</creator> | ||
| <parent>Glossary.Code.WebHome</parent> | ||
| <author>xwiki:XWiki.Admin</author> | ||
| <contentAuthor>xwiki:XWiki.Admin</contentAuthor> | ||
| <version>1.1</version> | ||
| <title/> | ||
| <comment/> | ||
| <minorEdit>false</minorEdit> | ||
| <syntaxId>xwiki/2.1</syntaxId> | ||
| <hidden>true</hidden> | ||
| <content>{{velocity}} | ||
| #set($object = $doc.getObject('Glossary.Code.GlossaryClass')) | ||
| #if (!$object) | ||
|
|
@@ -52,7 +52,7 @@ | |
| <dl> | ||
| <dt #if (!$editing && $hasEdit) | ||
| class="editableProperty" | ||
| data-property="$escapetool.xml($services.model.serialize($object.getPropertyReference('title')))" | ||
|
There was a problem hiding this comment. Note that this causes the glossary application to depends on 12.10.11 (it currently only requires 12.10). I guess it's acceptable, but I'm not really in charge of this application, so I prefer letting someone else decide. There was a problem hiding this comment. Indeed, it's weird that a new API was added in a bugfix release but it's the case : https://github.com/xwiki/xwiki-platform/blob/78f0a96fbe41e7f5c6242b1386bf1e7255dd1e1e/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/api/Object.java#L142 @jmiba Does it mean that the xobject doesn't have the "title" property set in some circumstances? That seems weird since that property comes from the |
||
| data-property-type="object"#end> | ||
| <label#if ($editing) for="Glossary.Code.GlossaryClass_0_title"#end> | ||
| $escapetool.xml($doc.displayPrettyName('title', false, false)) | ||
|
|
@@ -61,7 +61,7 @@ | |
| <dd>$doc.display('title')</dd> | ||
| <dt #if (!$editing && $hasEdit) | ||
| class="editableProperty" | ||
| data-property="$escapetool.xml($services.model.serialize($object.getPropertyReference('definition')))" | ||
| data-property-type="object"#end> | ||
| <label#if ($editing) for="Glossary.Code.GlossaryClass_0_definition"#end> | ||
| $escapetool.xml($doc.displayPrettyName('definition', false, false)) | ||
|
|
@@ -71,5 +71,5 @@ | |
| </dl> | ||
| </div> | ||
| {{/html}} | ||
| {{/velocity}}</content> | ||
| </xwikidoc> | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't see what's changed above. Maybe new lines?