Skip to content
Snippets Groups Projects
Commit ad85779f authored by Benoit Alessandroni's avatar Benoit Alessandroni
Browse files

Merge branch 'issue-1091' into switch/new_permissions

parents e0d41736 2ee9a4dc
No related branches found
No related tags found
2 merge requests!359fix: usage of community instead of community.community (wtf),!355Issue 1091
Pipeline #16763 passed with stages
in 7 minutes and 23 seconds
...@@ -8,10 +8,17 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac ...@@ -8,10 +8,17 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
div.segment.full.margin-bottom-xlarge div.segment.full.margin-bottom-xlarge
h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='communities.subTitle') h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='communities.subTitle')
if component.parameters.adminExtraSearch != null
- var extra_attr = component.parameters.adminExtraSearch
- var extra_fields = 'cell1, '+ component.parameters.adminExtraSearchFields
else
- var extra_attr = {}
- var extra_fields = 'cell1'
solid-form-search.form.search-form( solid-form-search.form.search-form(
id="admin-community-filter" id="admin-community-filter"
fields='cell1' fields=`${extra_fields}`
label-cell1='' label-cell1=''
widget-cell1='solid-form-label-text' widget-cell1='solid-form-label-text'
class-cell1="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" class-cell1="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
...@@ -19,7 +26,8 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac ...@@ -19,7 +26,8 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
submit-widget="button" submit-widget="button"
class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall" class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
data-trans='label-cell1=communities.searchBy;submit-button=goButton' data-trans='label-cell1=communities.searchBy;submit-button=goButton'
)
)&attributes(extra_attr)
.segment.table-wrapper .segment.table-wrapper
.table .table
...@@ -27,16 +35,24 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac ...@@ -27,16 +35,24 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
div.segment.table-cell.table-cell.half(data-trans='communities.tableHeader1') div.segment.table-cell.table-cell.half(data-trans='communities.tableHeader1')
div.segment.table-cell.table-cell.half(data-trans='communities.tableHeader2') div.segment.table-cell.table-cell.half(data-trans='communities.tableHeader2')
if component.parameters.adminExtraList != null
- var extra_list_attr = component.parameters.adminExtraList
- var extra_list_fields = 'cell1(name, counter), cell2(@id), '+ component.parameters.adminExtraListFields
else
- var extra_list_attr = {}
- var extra_list_fields = 'cell1(name, counter), cell2(@id)'
solid-display( solid-display(
class='table-body' class='table-body'
filtered-by='admin-community-filter' filtered-by='admin-community-filter'
bind-user bind-user
nested-field='communities' nested-field='communities'
fields='cell1(name, counter), cell2(@id)' fields=`${extra_list_fields}`
loader-id='loader-admin-community' loader-id='loader-admin-community'
class-cell1='segment table-cell half' class-cell1='segment table-cell half'
class-cell2='segment table-cell half text-center' class-cell2='segment table-cell half text-center'
class-cell3='hidden'
class-name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large ellipsis' class-name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large ellipsis'
widget-id='orbit-action-community' widget-id='orbit-action-community'
...@@ -44,7 +60,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac ...@@ -44,7 +60,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
widget-counter="orbit-admin-community-counter" widget-counter="orbit-admin-community-counter"
order-asc='name' order-asc='name'
) )&attributes(extra_list_attr)
div#loader-admin-community.loader.loader-top div#loader-admin-community.loader.loader-top
div div
......
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