Skip to content

Support arbitrary number of arguments for d:or and d:and in search queries - #7882

Merged
rullzer merged 1 commit into
masterfrom
search-and
Jan 16, 2018
Merged

Support arbitrary number of arguments for d:or and d:and in search queries#7882
rullzer merged 1 commit into
masterfrom
search-and

Conversation

@icewind1991

Copy link
Copy Markdown
Member

The sabredav plugin already handles this case, just have to properly transform it to the db query

See #3360 (comment)

…eries
Signed-off-by: Robin Appelman <robin@icewind.nl>
@mario

Copy link
Copy Markdown
Contributor

@icewind1991 yey :D

@ghost

Copy link
Copy Markdown

This fix works for me! Thanks very much to @icewind1991

ghost pushed a commit to Zimbra-Community/owncloud-zimlet that referenced this pull request Jan 16, 2018

@rullzerrullzer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works as expected!

@MorrisJobke

Copy link
Copy Markdown
Member

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 16, 2018
@ghost

ghost commented Jan 16, 2018 via email

Copy link
Copy Markdown

@MorrisJobke

Copy link
Copy Markdown
Member

Or is there still a change that it will be sooner. I am not in a hurry,
but I am interested to understand how you guys plan the project around git.

There is already a backport to stable13 approved and will be included in 13.0.0 😉 See #7883 for the backport

@codecov

codecovBot commented Jan 16, 2018

Copy link
Copy Markdown

Codecov Report

Merging #7882 into master will decrease coverage by <.01%.
The diff coverage is 100%.

@@ Coverage Diff @@## master #7882 +/- ##
============================================
- Coverage 51.24% 51.24% -0.01% - Complexity 24931 24933 +2 
============================================
Files 1604 1604 Lines 94970 95005 +35 Branches 1376 1376 ============================================
+ Hits 48668 48682 +14 - Misses 46302 46323 +21
Impacted FilesCoverage ΔComplexity Δ
lib/private/Files/Cache/QuerySearchHelper.php62.88% <100%> (+1.83%)33 <1> (-1)⬇️
core/Controller/LoginController.php78.47% <0%> (-0.26%)39% <0%> (ø)
apps/systemtags/list.php0% <0%> (ø)0% <0%> (ø)⬇️
core/templates/login.php0% <0%> (ø)0% <0%> (ø)⬇️
lib/private/legacy/app.php54.17% <0%> (+0.1%)222% <0%> (ø)⬇️
apps/files_trashbin/lib/Trashbin.php72.53% <0%> (+0.24%)136% <0%> (ø)⬇️
lib/private/Security/CertificateManager.php92.07% <0%> (+0.99%)39% <0%> (ø)⬇️
lib/private/Files/Cache/Propagator.php96.2% <0%> (+1.26%)16% <0%> (ø)⬇️
lib/private/App/CodeChecker/DeprecationCheck.php13.55% <0%> (+3.35%)8% <0%> (+3%)⬆️

@rullzer
rullzer merged commit 2b70c70 into masterJan 16, 2018
@rullzer
rullzer deleted the search-and branch January 16, 2018 18:53
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finish

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@icewind1991@mario@MorrisJobke@rullzer