diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2016-06-13 18:42:57 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2016-06-13 18:42:57 -0400 |
| commit | 65d5f68cc6dc81799c5a5d90400a2c1f0dd02547 (patch) | |
| tree | 6f245ba901b87ef42fed69965aea22f5eea6b590 /Plugins/HtmlExport/htmlexport.cpp | |
| parent | aeb6bad01630d325a4e768e798a7a6d44e18fdaf (diff) | |
| parent | 5d9314f134ddd3dc4c853e398ac90ba247fb2e4f (diff) | |
Merge tag 'upstream/3.1.0'
Upstream version 3.1.0
# gpg: Signature made Mon 13 Jun 2016 06:42:54 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.com>"
Diffstat (limited to 'Plugins/HtmlExport/htmlexport.cpp')
| -rw-r--r-- | Plugins/HtmlExport/htmlexport.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Plugins/HtmlExport/htmlexport.cpp b/Plugins/HtmlExport/htmlexport.cpp index 75b3868..86ac13e 100644 --- a/Plugins/HtmlExport/htmlexport.cpp +++ b/Plugins/HtmlExport/htmlexport.cpp @@ -347,13 +347,16 @@ bool HtmlExport::exportIndex(const QString& database, const QString& name, const decrIndent(); writeln("</tr>"); - for (SqliteIndexedColumn* idxCol : createIndex->indexedColumns) + QString collate; + for (SqliteOrderBy* idxCol : createIndex->indexedColumns) { + collate = idxCol->getCollation(); + writeln("<tr>"); incrIndent(); - writeln(QString("<td>%1</td>").arg(escape(idxCol->name))); - writeln(QString("<td align=\"center\">%1</td>").arg(idxCol->collate.isNull() ? " " : escape(idxCol->collate))); - writeln(QString("<td align=\"center\">%1</td>").arg(idxCol->sortOrder == SqliteSortOrder::null ? " " : sqliteSortOrder(idxCol->sortOrder))); + writeln(QString("<td>%1</td>").arg(escape(idxCol->getColumnString()))); + writeln(QString("<td align=\"center\">%1</td>").arg(collate.isNull() ? " " : escape(collate))); + writeln(QString("<td align=\"center\">%1</td>").arg(idxCol->order == SqliteSortOrder::null ? " " : sqliteSortOrder(idxCol->order))); decrIndent(); writeln("</tr>"); } |