Hi,

I am trying to use the views filter "Domain Source: Domain Source ID" in order to only show nodes which have the "current domain" specified as their "source".

The problem: only nodes which have "source domain" explicitly set to the current domain are listed in the view; nodes which have the source domain set as "Use active domain" are not listed!

The domain_source table in the database contains "-5" for all nodes using "Use active domain"; the condition in the views query only checks for the actual domain id:

SELECT [...] FROM {node} node [...]
LEFT JOIN {domain_source} domain_source ON node.nid = domain_source.nid [...]
WHERE [...] (domain_source.domain_id IN  ('4') [...]

In the case of filtering by "current domain", I would expect the filter to be domain_source.domain_id IN ('4', '-5').

CommentFileSizeAuthor
#13 domain-source-views-1685658-13.patch2.36 KBbforchhammer
#11 domain-source-views-fix-1685658-11.patch2.55 KBbforchhammer
#3 domain-source-views-fix-1685658-3.patch1.11 KBbforchhammer
#1 domain-source-views-fix-1685658-1.patch853 bytesbforchhammer

Comments

bforchhammer’s picture

bforchhammer commented
StatusFileSize
new domain-source-views-fix-1685658-1.patch853 bytes

Attached patch fixes the issue described above.

bforchhammer’s picture

bforchhammer commented
Status: Active » Needs review
bforchhammer’s picture

bforchhammer commented
StatusFileSize
new domain-source-views-fix-1685658-3.patch1.11 KB

Improved php-docs.

agentrickard’s picture

agentrickard
he/him
Primary language English
Location Georgia (US)
commented

A couple of questions here:

* Is hook_views_pre_build() better than using a query() method?
* Don't the tables need to be aliased in domain_source_views_pre_build()?

bforchhammer’s picture

bforchhammer commented

Is hook_views_pre_build() better than using a query() method?

I'm assuming you mean a query() on a respective filter handler? Yes, that would probably work as well, but it would mean a custom filter handler class (I think), or an adjustment of the generic filter handler provided by domain_views. The hook implementation seemed like the easier solution.

Don't the tables need to be aliased in domain_source_views_pre_build()?

Hm, you're probably right. For me both values were the same...

agentrickard’s picture

agentrickard
he/him
Primary language English
Location Georgia (US)
commented
Status: Needs review » Needs work

I think the query() method on the filter object is "better", so we should try that.

Aliasing is definitely required.

planctus’s picture

planctus commented

the patch didn't fix the problem for me...
Actually this is really critical for me, i had to teach my client to set the domain source manually, otherwise the website was out of control...
I'll try to see where the problem originates in my installation, but it's a bad time for this to happen..
Thanks,
Da.

bforchhammer’s picture

bforchhammer commented

I'll have another look at this after drupalcon...

planctus’s picture

planctus commented

Sorry, i'm still trying to figure out how this could happen, but i've totally misunderstood the way domain_source works and this issue consequently, since i used domain access so many times...
My problem was the opposite, anyway..i wanted to filter nodes basing on the domain_source value, but i used the "use active domain" as it would mean "set the active domain during the node creation as the source domain" but it works differently, now i see...
I must say it is pretty ambiguous, but that's a different story.. :)
So, forget my previous comment..
Thanks,
Da.

ParisLiakos’s picture

ParisLiakos commented

I must say it is pretty ambiguous, but that's a different story.. :)

I just had the same problem, took me a while to figure out as well.
I think the behavior was different on 6.x or am i wrong?

I think it makes much more sense to store the domain that was used when creating the node..
If "use active domain" is something like a wildcard, there is no point creating an entry in the database for this node, right?

bforchhammer’s picture

bforchhammer commented
Status: Needs work » Needs review
StatusFileSize
new domain-source-views-fix-1685658-11.patch2.55 KB

Attached new patch overriding the query method as per #6. Identical In terms of functionality.

agentrickard’s picture

agentrickard
he/him
Primary language English
Location Georgia (US)
commented
Status: Needs review » Needs work

Why is this in the patch?

-files[] = domain_source.domain.inc
-files[] = domain_source.install
-files[] = domain_source.module
-files[] = domain_source.views.inc

And we have to register the new handler IIRC.

bforchhammer’s picture

bforchhammer commented
StatusFileSize
new domain-source-views-1685658-13.patch2.36 KB

Sorry, I removed the files[] array because you actually only have to register files containing classes or interfaces (see docs); that should probably go into a separate issue/patch.

The handler is registered in domain_source_views_data(), and added to the files[] array. Should be enough afaik, no?

Attached patch restores the removed files[] statements and fixes empty lines at the end of files.

agentrickard’s picture

agentrickard
he/him
Primary language English
Location Georgia (US)
commented
Status: Needs work » Needs review

My understanding -- and tests have proven it -- is that you have to include files[] for anything that registers a hook as well. The link above is broken.

bforchhammer’s picture

bforchhammer commented

Fixed the link above. This is the relevant bit of text:

Drupal now supports a dynamic-loading code registry. To support it, all modules must now declare any code files containing class or interface declarations in the .info file, like so: [...] When a module is enabled, Drupal will rescan all declared files and index all the classes and interfaces that it finds. Classes will be loaded automatically by PHP when they are first accessed.

agentrickard’s picture

agentrickard
he/him
Primary language English
Location Georgia (US)
commented
Status: Needs review » Patch (to be ported)

Committed to 7.x.3.

263f9f3..a31267c  7.x-3.x -> 7.x-3.x
agentrickard’s picture

agentrickard
he/him
Primary language English
Location Georgia (US)
commented

Pushed to 7.x.2.

ee6c08c..b904022  7.x-2.x -> 7.x-2.x
agentrickard’s picture

agentrickard
he/him
Primary language English
Location Georgia (US)
commented
Status: Patch (to be ported) » Fixed

Committed to 6.x.2.

   7840d8c..1140172  6.x-2.x -> 6.x-2.x
bforchhammer’s picture

bforchhammer commented

Wonderful, thanks Ken :)

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.