|
|
@@ -1776,7 +1776,7 @@ class TableAjax extends ViewAjax {
|
|
|
for (var i = lowerPage; i <= upperPage; i++) {
|
|
|
var link;
|
|
|
//if (i != currPage) link = $(p5Utils__format('<li class="{1}"><a href="#">{0}</a></li>', [i, i > totalPages ? 'disabled' : '']));
|
|
|
- if (i != currPage) link = $(p5Utils__format('<button type="button" class="btn btn-default{1}">{0}</button>', [i, i > totalPages ? 'disabled' : '']));
|
|
|
+ if (i != currPage) link = $(p5Utils__format('<button type="button" class="btn btn-default{1}">{0}</button>', [i, i > totalPages ? ' disabled' : '']));
|
|
|
//if (i == currPage) link = $(p5Utils__format('<li class="active"><a href="#">{0}</a></li>', [i]));
|
|
|
if (i == currPage) link = $(p5Utils__format('<button type="button" class="btn btn-default active">{0}</button>', [i]));
|
|
|
|
|
|
@@ -5647,6 +5647,21 @@ jQuery(document).ready(function(){
|
|
|
} break;
|
|
|
}
|
|
|
break;
|
|
|
+ case 'p5Type':
|
|
|
+ switch ($typeName) {
|
|
|
+ case 'enum': $columnConfig->type = 'string'; break;
|
|
|
+ case 'alias': {
|
|
|
+ $format = $acl->getXsdFieldParam($col, 'format');
|
|
|
+ if ($format) $columnConfig->format = $format;
|
|
|
+ } break;
|
|
|
+ case 'integer': $columnConfig->type = 'number'; break;
|
|
|
+ case 'string': {
|
|
|
+ $columnConfig->type = 'p5:string';
|
|
|
+ $columnConfig->formatByValue = $acl->getXsdFieldParam($col, 'formatByValue');
|
|
|
+ if ($aliasMap = $acl->getXsdFieldParam($col, 'aliasMap')) $columnConfig->aliasMap = $aliasMap;
|
|
|
+ } break;
|
|
|
+ }
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
|