Skip to content

Don't show a filter if user lacks permissions to read its field #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RickMohr merged 1 commit into from
Feb 25, 2016
Merged

Don't show a filter if user lacks permissions to read its field #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OpenTreeMap/resources/MainStoryboard_iPhone.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@
<action selector="clearFilters:" destination="hZa-Zz-ezt" id="pkm-i2-3of"/>
</connections>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" title="Done" style="done" id="50L-7V-eyE">
<barButtonItem key="rightBarButtonItem" title="Search" style="done" id="50L-7V-eyE">
<connections>
<action selector="updateFilters:" destination="hZa-Zz-ezt" id="IFD-Fh-Bcb"/>
</connections>
Expand Down
13 changes: 11 additions & 2 deletions OpenTreeMap/src/OTM/OTMEnvironment.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@ - (void)updateEnvironmentWithDictionary:(NSDictionary *)dict {
NSArray *regFilters = [self filtersFromDictArray:missingAndStandardFilters[@"standard"]
usingFields:[dict objectForKey:@"fields"]];

NSArray *missingFilters = [self missingFiltersFromDictArray:missingAndStandardFilters[@"missing"]];
NSArray *missingFilters = [self missingFiltersFromDictArray:missingAndStandardFilters[@"missing"]
usingFields:[dict objectForKey:@"fields"]];

self.filters = [regFilters arrayByAddingObjectsFromArray:missingFilters];

Expand Down Expand Up @@ -260,12 +261,16 @@ - (void)updateEnvironmentWithDictionary:(NSDictionary *)dict {
* All missing filters are boolean filters with "existenceFilter"
* set to true.
*/
- (NSArray *)missingFiltersFromDictArray:(NSArray *)filterlist {
- (NSArray *)missingFiltersFromDictArray:(NSArray *)filterlist usingFields:(NSDictionary *)fieldDict {
NSMutableArray *filterArray = [NSMutableArray array];

[filterlist enumerateObjectsUsingBlock:^(NSDictionary *filter, NSUInteger idx, BOOL *stop) {
NSString *fieldKey = filter[@"identifier"];
NSString *fieldName = filter[@"label"];

if ([fieldDict objectForKey:fieldKey] == nil) {
return; // Skip field because user lacks read permission
}

OTMFilter *afilter = [[OTMBoolFilter alloc] initWithName:fieldName
key:fieldKey
Expand All @@ -287,6 +292,10 @@ - (NSArray *)filtersFromDictArray:(NSArray *)filterlist usingFields:(NSDictionar
NSString *fieldName = filter[@"label"];
NSString *filterType = filter[@"search_type"];

if ([fDict objectForKey:fieldKey] == nil) {
return; // Skip field because user lacks read permission
}

OTMFilter *afilter = nil;

if ([filterType isEqualToString:@"CHOICE"] || [filterType isEqualToString:@"MULTICHOICE"]) {
Expand Down