Special case with Domain Access

Thanks for the patch dkruglyak!
It seems a straightforward, non-intrusive change.
Let's see what the community has to say about it and if all remains well, I'll include in a next release.
Rik

Committing. Development snapshot will be available later today

This patch is not quite right. The following code:

      // Domain Access has special case with a global cross-domain grant
      if ($module == 'domain') {
          $module_gids[] = "(nid=$nid AND gid=0 AND realm='domain_site')";        
      }

Needs to become:

      // Domain Access has special case with a global cross-domain grant
      if ($module == 'domain' && $nid) {
          $module_gids[] = "(nid=$nid AND gid=0 AND realm='domain_site')";        
      }

As $nid may not exist there, and will cause SQL errors. not sure why $nid won't be there, but I experienced this myself.

So either the if $module == 'domain' part goes inside the if ($nid) check, or a check is added to the if test provided. Trivial solution, not sure which way you'd liked to go.

Actually, on closer look, this patch doesn't seem like a very clean solution. I can't exactly think of a better one, as I'm not 100% sure what it's trying to achieve. I'm relatively new to the domain module, and I'm a bit lost in it at the moment, but I do know that using the http://drupal.org/project/domain_adv module has cleaned up a lot of my issues when used with content_access(). Perhaps using that module would be a better solution?

It is possible for nid not to exist, because it happened to me. :) I got an SQL error because of it. Not sure where, why or how, though I was still constructing the site, so perhaps that is why it happened. Still should be fixed, even if it's a rare edge case.

I wasn't suggesting module grants depend on it, but perhaps the combination of domain and module grants would work better with it. A documentation issue.

The extra test for an empty nid is a good case of defensive programming at low cost. I'll put it in my next batch of enhancements.
Thanks guys.
Rik

Available in snapshots dated 10-Nov-09 or later.

hi,

i'm using Domain Access and Workflow, and i'm having problems with different workflow states for different domains. Eg.: in my case, each domain can have its own state defined, so i copied 2 tables in DA: workflow_node and workflow_node_history.

These tables are getting updated normally, when i check at the database, sid values are right. But when i try to view as anonymous user that node in one domain checked to invisible status, it is actually visible, because the status, independently of the domain is always the last one modified.

I tried to hard code the function workflow_node_current_state($node) to get the the sid from DA doubled table, but even so it's getting the last modified state.

How can i configure to be able to have two grants:
1 - the DA permission to see the node at one domain
2 - the role permission to see a workflow state

Thanks,
Carlos

Activating

hi,

i'm using workflow 6.x-1.3 and it has a sub module called workflow access.
where can i look these integrations?

can you send me examples?

thanks,
Carlos

This issue was closed at #10.
Subsequent comments seem to refer to the Workflow module etc. rather than Module Grants.
If necessary please post again in the appropriate forum.