Skip to content

Commit

Permalink
fix camp selection content (#782)
Browse files Browse the repository at this point in the history
  • Loading branch information
Aroundafur committed Mar 20, 2018
1 parent 7988968 commit a658b90
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion views/pages/camps/index_admin.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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}}`)
Expand Down
5 changes: 3 additions & 2 deletions views/pages/camps/index_user.jade
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down

0 comments on commit a658b90

Please sign in to comment.