diff options
author | Zhe Sun <31067185+ZheSun88@users.noreply.github.com> | 2019-05-23 09:43:31 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-23 09:43:31 +0300 |
commit | 0b7457325200162961cae52e7d871db928dc3cd9 (patch) | |
tree | 880bbb73259b135e53ee753c2591099e480c70f4 /documentation/datamodel | |
parent | bb4898cdfb4f5d2bd34904eb1920b837ac9a3c37 (diff) | |
download | vaadin-framework-0b7457325200162961cae52e7d871db928dc3cd9.tar.gz vaadin-framework-0b7457325200162961cae52e7d871db928dc3cd9.zip |
Update broken docs syntax in github (#11596)
* Add delay to the unstable test
* Add delay for unstable tests
* Update broken docs syntax in github
* Merge branch 'master' into ZheSun88-patch-1
* Update doc reference syntax
* Merge branch 'ZheSun88-patch-1' of github.com:vaadin/framework into ZheSun88-patch-1
# Conflicts:
# documentation/components/components-overview.asciidoc
* Merge branch 'master' into ZheSun88-patch-1
* use .asciidoc
* Merge remote-tracking branch 'origin/ZheSun88-patch-1' into ZheSun88-patch-1
* use .asciidoc
* Merge branch 'master' into ZheSun88-patch-1
Diffstat (limited to 'documentation/datamodel')
-rw-r--r-- | documentation/datamodel/datamodel-fields.asciidoc | 2 | ||||
-rw-r--r-- | documentation/datamodel/datamodel-hierarchical.asciidoc | 6 | ||||
-rw-r--r-- | documentation/datamodel/datamodel-overview.asciidoc | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/documentation/datamodel/datamodel-fields.asciidoc b/documentation/datamodel/datamodel-fields.asciidoc index 539027d5f1..060a1c7d82 100644 --- a/documentation/datamodel/datamodel-fields.asciidoc +++ b/documentation/datamodel/datamodel-fields.asciidoc @@ -55,4 +55,4 @@ This is useful for showing the user that the data is there, even though the user When editing multiple values from the same business object, you can use `Binder` to simplify how the values of all input fields in a form are handled. -<<dummy/../../../framework/datamodel/datamodel-forms.asciidoc#datamodel.forms,"Binding Data to Forms">> describes how this is done. +<<datamodel-forms.asciidoc#datamodel.forms,"Binding Data to Forms">> describes how this is done. diff --git a/documentation/datamodel/datamodel-hierarchical.asciidoc b/documentation/datamodel/datamodel-hierarchical.asciidoc index 11fc699082..a581115063 100644 --- a/documentation/datamodel/datamodel-hierarchical.asciidoc +++ b/documentation/datamodel/datamodel-hierarchical.asciidoc @@ -10,8 +10,8 @@ layout: page The [classname]#Tree# and the [classname]#TreeGrid# components allow you to show data with hierarchical relationships between items. That data can be populated by on-demand from a back end by implementing the [interfacename]#HierarchicalDataProvider# interface. If you have the data available in-memory on the server, you use the collection style API of [classname]#TreeData# and then pass it to a [classname]#TreeDataProvider#. This chapter introduces the hierarchical data providers and how they work. -For using them with the components you should see <<dummy/../../../framework/components/components-tree.asciidoc#components.tree,"Tree">> -and <<dummy/../../../framework/components/components-treegrid.asciidoc#components.treegrid,"TreeGrid">> documentation. +For using them with the components you should see <<../components/components-tree.asciidoc#components.tree,"Tree">> +and <<../components/components-treegrid.asciidoc#components.treegrid,"TreeGrid">> documentation. == In-memory Hierarchical Data @@ -66,7 +66,7 @@ dataProvider.setFilter(project -> project.getHours() > 100); == Lazy Loading Hierarchical Data from a Back End -The lazy loading hierarchical data, same concepts apply as with the non-hierarchical data, so you should take a look at <<dummy/../../../framework/datamodel/datamodel-providers.asciidoc#datamodel.dataproviders.lazy,"Lazy Loading Data to a Listing">> if you have not already. +The lazy loading hierarchical data, same concepts apply as with the non-hierarchical data, so you should take a look at <<datamodel-providers.asciidoc#datamodel.dataproviders.lazy,"Lazy Loading Data to a Listing">> if you have not already. To load hierarchical data on-demand from your back end, you should extend the [classname]#AbstractHierarchicalDataProvider# class. Then you just have to implement the following three methods: diff --git a/documentation/datamodel/datamodel-overview.asciidoc b/documentation/datamodel/datamodel-overview.asciidoc index 49b936c77e..6580235e26 100644 --- a/documentation/datamodel/datamodel-overview.asciidoc +++ b/documentation/datamodel/datamodel-overview.asciidoc @@ -11,23 +11,23 @@ The Vaadin Data Model is one of the core concepts of the library. There is a standard data interface that all UI components use to access and modify the application's data. The most basic UI component for handling data is a field component that lets the user define a single value, for instance a text field for writing the name of a product or a dropdown menu for selecting which department an employee belongs to. -See <<dummy/../../../framework/datamodel/datamodel-fields.asciidoc#datamodel.fields,"Editing Values in Fields">> to learn how these components can be used on their own. +See <<datamodel-fields.asciidoc#datamodel.fields,"Editing Values in Fields">> to learn how these components can be used on their own. In most applications, there are business classes that represent real-world objects like a single employee or a product in an inventory. The user interface is structured as a form that lets the user edit all the different properties of a single business object instance. Vaadin Framework makes it easy to create forms for editing these sorts. You have full control over how you configure and lay out the individual input fields making up a form, and then you can use `Binder` to hook up those fields to a business object instance. -<<dummy/../../../framework/datamodel/datamodel-forms.asciidoc#datamodel.forms,"Binding Data to Forms">> shows how to bind data to fields. +<<datamodel-forms.asciidoc#datamodel.forms,"Binding Data to Forms">> shows how to bind data to fields. There are UI components in the framework that lists multiple similar objects and lets the user view, select and in some cases even edit those objects. A listing component can get its data from an in-memory collection or lazily fetch it from some backend. In either case, there are options available for defining how the data is sorted and filtered before being displayed to the user. -Read more about how to provide lists of data to these components in <<dummy/../../../framework/datamodel/datamodel-providers.asciidoc#datamodel.providers,"Showing Many Items in a Listing">>. For using hierarchical data, see <<dummy/../../../framework/datamodel/datamodel-hierarchical.asciidoc#datamodel.hierarchical,"Hierarchical Data">>. -Using a listing component as an input field to select one or many of the listed items is described in <<dummy/../../../framework/datamodel/datamodel-selection.asciidoc#datamodel.selection,"Selecting items">>. +Read more about how to provide lists of data to these components in <<datamodel-providers.asciidoc#datamodel.providers,"Showing Many Items in a Listing">>. For using hierarchical data, see <<datamodel-hierarchical.asciidoc#datamodel.hierarchical,"Hierarchical Data">>. +Using a listing component as an input field to select one or many of the listed items is described in <<datamodel-selection.asciidoc#datamodel.selection,"Selecting items">>. Vaadin Data Model topic references:: -* <<dummy/../../../framework/datamodel/datamodel-fields.asciidoc#datamodel.fields,"Editing Values in Fields">> -* <<dummy/../../../framework/datamodel/datamodel-forms.asciidoc#datamodel.forms,"Binding Data to Forms">> -* <<dummy/../../../framework/datamodel/datamodel-providers.asciidoc#datamodel.providers,"Showing Many Items in a Listing">> -* <<dummy/../../../framework/datamodel/datamodel-selection.asciidoc#datamodel.selection,"Selecting items">> -* <<dummy/../../../framework/datamodel/datamodel-hierarchical.asciidoc#datamodel.hierarchical,"Hierarchical Data">> +* <<datamodel-fields.asciidoc#datamodel.fields,"Editing Values in Fields">> +* <<datamodel-forms.asciidoc#datamodel.forms,"Binding Data to Forms">> +* <<datamodel-providers.asciidoc#datamodel.providers,"Showing Many Items in a Listing">> +* <<datamodel-selection.asciidoc#datamodel.selection,"Selecting items">> +* <<datamodel-hierarchical.asciidoc#datamodel.hierarchical,"Hierarchical Data">> |