Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BudgetMaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Robert Goldmann
BudgetMaster
Commits
9dd00256
Commit
9dd00256
authored
7 years ago
by
Robert Goldmann
Browse files
Options
Downloads
Patches
Plain Diff
#96
- fixed: filter active icon not showing if filtered by tags
parent
3decdf15
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!213
merge v1_6_0 into master
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/de/deadlocker8/budgetmaster/logic/FilterSettings.java
+29
-24
29 additions, 24 deletions
src/de/deadlocker8/budgetmaster/logic/FilterSettings.java
with
29 additions
and
24 deletions
src/de/deadlocker8/budgetmaster/logic/FilterSettings.java
+
29
−
24
View file @
9dd00256
...
...
@@ -164,7 +164,7 @@ public class FilterSettings
}
else
{
return
true
;
return
isEqualTagIDs
(
otherSettings
)
;
}
}
else
...
...
@@ -177,11 +177,17 @@ public class FilterSettings
{
if
(
allowedCategoryIDs
.
equals
(
otherSettings
.
getAllowedCategoryIDs
()))
{
return
true
;
return
isEqualTagIDs
(
otherSettings
);
}
}
}
}
return
false
;
}
private
boolean
isEqualTagIDs
(
FilterSettings
otherSettings
)
{
if
(
allowedTagIDs
==
null
)
{
if
(
otherSettings
.
getAllowedTagIDs
()
!=
null
)
...
...
@@ -207,7 +213,6 @@ public class FilterSettings
}
}
}
}
return
false
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment