From e746fec7d33388baa9700797d89714f5d63fbe89 Mon Sep 17 00:00:00 2001 From: Doron Smoliansky Date: Tue, 20 Mar 2018 15:12:23 +0200 Subject: [PATCH] fix camp selection content --- views/pages/camps/index_admin.jade | 3 ++- views/pages/camps/index_user.jade | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/views/pages/camps/index_admin.jade b/views/pages/camps/index_admin.jade index 0a5d957c6..d1efd8337 100644 --- a/views/pages/camps/index_admin.jade +++ b/views/pages/camps/index_admin.jade @@ -58,7 +58,8 @@ block content //- th.admin-edit=t(t_prefix+'stats.edit') //- th.admin-remove=t(t_prefix+'stats.remove') tbody - tr(ng-repeat="camp in camps | filter: searchCamp | orderBy: orderCamps") + - var filteredCamps = ['theme_camp', 'prod_dep']; + tr(ng-repeat="camp in camps | filter: searchCamp | filter: inArray:filteredCamps:'__prototype' | orderBy: orderCamps") td {{ camp.id }} td a(ng-href=`/${language}/camps/{{camp.id}}`) diff --git a/views/pages/camps/index_user.jade b/views/pages/camps/index_user.jade index 0610aa4a4..6bff41a4d 100644 --- a/views/pages/camps/index_user.jade +++ b/views/pages/camps/index_user.jade @@ -1,5 +1,6 @@ extends ../../includes/page block content + - var filteredCamps = ['art_installation']; input.hidden.meta(id='meta__lang', value='#{language}') .camps.camp_index(ng-app="ngCamps") section @@ -17,12 +18,12 @@ block content label=t('camps:new.name_en') input.hidden(id='join_camp_request_join_user_id', type='hidden', value='#{user.attributes.user_id}') select(type="text", id='join_camp_request_camp_id', class="form-control", name="camp_name_en", autofocus="true", required) - option(ng-repeat="camp in camps | orderBy:'camp_name_en'", value="{{camp.id}}") {{camp.camp_name_en}} + option(ng-repeat="camp in camps | filter: inArray:filteredCamps:'__prototype' | orderBy:'camp_name_en'", value="{{camp.id}}") {{camp.camp_name_en}} else label=t('camps:new.name_he') input.hidden(id='join_camp_request_join_user_id', type='hidden', value='#{user.attributes.user_id}') select(type="text", id='join_camp_request_camp_id', class="form-control", name="camp_name_he", autofocus="true", required) - option(ng-repeat="camp in camps| orderBy:'camp_name_he'", value="{{camp.id}}") {{camp.camp_name_he}} + option(ng-repeat="camp in camps | filter: inArray:filteredCamps:'__prototype' | orderBy:'camp_name_he'", value="{{camp.id}}") {{camp.camp_name_he}} .col-sm-4.col-xs-12 a.Btn.Btn__green.Btn__inline(ng-click="joinRequest()", role='button')=t('camps:join.request') else