Skip to content
Snippets Groups Projects
Commit 647224cc authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request !329
parents ad6f1936 baf89169
No related branches found
No related tags found
1 merge request!329Develop
Pipeline #5077 passed
...@@ -14,7 +14,7 @@ form={{form:SE}} ...@@ -14,7 +14,7 @@ form={{form:SE}}
# List of Forms: Do not show this list of forms if there is a form given by SIP. # List of Forms: Do not show this list of forms if there is a form given by SIP.
# Table header. # Table header.
sql = SELECT '<th data-sorter="false" class="filter-false">' sql = SELECT '<th data-sorter="false" class="filter-false">'
, CONCAT('p:{{pageAlias:T}}&form=Form&') as _pagen , CONCAT('p:{{pageAlias:T}}&form=form&') as _pagen
, '</th><th>Name' , '</th><th>Name'
, '</th><th>Title' , '</th><th>Title'
, '</th><th>Table' , '</th><th>Table'
...@@ -31,7 +31,7 @@ form={{form:SE}} ...@@ -31,7 +31,7 @@ form={{form:SE}}
20 { 20 {
# All forms # All forms
sql = SELECT CONCAT('p:{{pageAlias:T}}&form=Form&r=', f.id) as _pagee sql = SELECT CONCAT('p:{{pageAlias:T}}&form=form&r=', f.id) as _pagee
, CONCAT(f.name, ' <span class="text-muted">(', f.id, ')</span>') , CONCAT(f.name, ' <span class="text-muted">(', f.id, ')</span>')
, QMORE(strip_tags(f.title),50) , QMORE(strip_tags(f.title),50)
, f.tableName , f.tableName
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment