refactor(tml-export): various fixes + switch to 1.0.0

tduchateau · tduchateau · commit c6dc974191bb · 2015-06-30T18:16:46.000+02:00
* Fixed wrong URLs
* Improved comments
diff --git a/datatables-thymeleaf-export/README.md b/datatables-thymeleaf-export/README.md
@@ -38,7 +38,7 @@ You can then access the sample here: [http://localhost:9090/datatables-thymeleaf
 
 ## Bug/improvement
 
-Please report it using the issue tracker dedicated to all sample apps: [https://waffle.io/dandelion/dandelion-samples](https://waffle.io/dandelion/dandelion-samples)
+Please report it using the issue tracker dedicated to all sample apps: [https://github.com/dandelion/dandelion-datatables-samples/issues](https://github.com/dandelion/dandelion-datatables-samples/issues)
 
 =
 The [Dandelion team](http://dandelion.github.io/team/).
diff --git a/datatables-thymeleaf-export/pom.xml b/datatables-thymeleaf-export/pom.xml
@@ -4,7 +4,7 @@
 
    <groupId>com.github.dandelion</groupId>
    <artifactId>datatables-thymeleaf-export</artifactId>
-   <version>1.0.0-SNAPSHOT</version>
+   <version>1.0.0</version>
    <packaging>war</packaging>
 
    <name>Dandelion :: Samples :: Datatables :: datatables-thymeleaf-basics</name>
@@ -18,7 +18,7 @@
          <dependency>
             <groupId>com.github.dandelion</groupId>
             <artifactId>dandelion-datatables-samples-bom</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.0</version>
             <type>pom</type>
             <scope>import</scope>
          </dependency>
diff --git a/datatables-thymeleaf-export/src/main/java/com/github/dandelion/datatables/web/ExportController.java b/datatables-thymeleaf-export/src/main/java/com/github/dandelion/datatables/web/ExportController.java
@@ -14,6 +14,7 @@
 import com.github.dandelion.datatables.core.export.ExportConf;
 import com.github.dandelion.datatables.core.export.ExportUtils;
 import com.github.dandelion.datatables.core.export.HtmlTableBuilder;
+import com.github.dandelion.datatables.core.export.ReservedFormat;
 import com.github.dandelion.datatables.core.export.XmlExport;
 import com.github.dandelion.datatables.core.html.HtmlTable;
 import com.github.dandelion.datatables.extras.export.itext.PdfExport;
@@ -42,7 +43,7 @@ public void csv(@DatatablesParams DatatablesCriterias criterias, HttpServletRequ
 
 		// Build the export configuration
 		// The custom format "myFormat" is just a wrapper around pdf
-		ExportConf exportCsvConf = new ExportConf.Builder("csv").header(true).exportClass(new CsvExport()).build();
+		ExportConf exportCsvConf = new ExportConf.Builder(ReservedFormat.CSV).header(true).exportClass(new CsvExport()).build();
 
 		// Build the table to export from the data and the export configuration
 		HtmlTable table = new HtmlTableBuilder<Person>().newBuilder("tableId", persons, request, exportCsvConf)
diff --git a/datatables-thymeleaf-export/src/main/webapp/WEB-INF/views/common/navbar.html b/datatables-thymeleaf-export/src/main/webapp/WEB-INF/views/common/navbar.html
@@ -2,7 +2,7 @@
 <html xmlns:th="http://www.thymeleaf.org">
 <body>
    <div th:fragment="navbar">
-      <a href="https://github.com/dandelion/dandelion-samples"> 
+      <a href="https://github.com/dandelion/dandelion-datatables-samples"> 
          <img style="position: fixed; top: 0; left: 0; border: 0; z-index: 1500;" src="https://s3.amazonaws.com/github/ribbons/forkme_left_green_007200.png" alt="Fork me on GitHub" />
       </a>
       <div class="navbar navbar-fixed-top">
@@ -48,7 +48,7 @@
                         <ul class="dropdown-menu">
                            <li><a href="http://dandelion.github.io/datatables">Documentation</a></li>
                            <li><a href="http://dandelion-forum.48353.x6.nabble.com/">Forum</a></li>
-                           <li><a href="https://waffle.io/dandelion/dandelion-samples">Report an issue</a></li>
+                           <li><a href="https://github.com/dandelion/dandelion-datatables-samples/issues">Report an issue</a></li>
                         </ul>
                      </li>
                   </ul>
diff --git a/datatables-thymeleaf-export/src/main/webapp/WEB-INF/views/dom/filter-based.html b/datatables-thymeleaf-export/src/main/webapp/WEB-INF/views/dom/filter-based.html
@@ -24,17 +24,17 @@ <h3>DOM sources / Filter-based export</h3>
          <div class="span12">
 
             <div dt:conf="myTableId">
-               <div dt:confType="export" dt:type="csv" dt:cssClass="btn" dt:url="@{/context/customCsvUrl}"></div>
+               <div dt:confType="export" dt:type="csv" dt:cssClass="btn"></div>
             </div>
 
             <table id="myTableId" dt:table="true" dt:export="csv">
                <thead>
                   <tr>
-                     <th dt:property="id">Id</th>
-                     <th dt:property="firstName">Firstname</th>
-                     <th dt:property="lastName">Lastname</th>
-                     <th dt:property="address.town.name">City</th>
-                     <th dt:property="mail">Mail</th>
+                     <th>Id</th>
+                     <th>Firstname</th>
+                     <th>Lastname</th>
+                     <th>City</th>
+                     <th>Mail</th>
                   </tr>
                </thead>
                <tbody>

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ You can then access the sample here: [http://localhost:9090/datatables-thymeleaf`
`38`	`38`
`39`	`39`	`## Bug/improvement`
`40`	`40`
`41`		`-Please report it using the issue tracker dedicated to all sample apps: [https://waffle.io/dandelion/dandelion-samples](https://waffle.io/dandelion/dandelion-samples)`
	`41`	`+Please report it using the issue tracker dedicated to all sample apps: [https://github.com/dandelion/dandelion-datatables-samples/issues](https://github.com/dandelion/dandelion-datatables-samples/issues)`
`42`	`42`
`43`	`43`	`=`
`44`	`44`	`The [Dandelion team](http://dandelion.github.io/team/).`