On the Features page, the feature indicates a conflict: Conflicts with: oa_panopoly_users

I'm not exactly sure what Open Atrium Panopoly Users does, but it seems pretty important (required by Open Atrium Users!).

Is there any way to resolve this conflict?

Thanks.

Comments

dsnopek’s picture

Status: Active » Postponed (maintainer needs more info)

What version of Panopoly Users are you using?

gboudrias’s picture

Status: Postponed (maintainer needs more info) » Closed (works as designed)

Hmm 7.x-1.0-rc5... I'll try again with the stable version.

dsnopek’s picture

Status: Closed (works as designed) » Active

Er, actually, I was checking mostly to see if you had manually upgraded to Panopoly Users 1.0. Definitely don't update it manually, wait until Open Atrium does it for you!

Re-opening - I'll look into it when I have a chance. :-)

gboudrias’s picture

Yeah I see that the makefile (from git) has that version as well:

drupal-org.make:projects[panopoly_users][version] = 1.0-rc5

Although I'm not really sure which makefile to use to be honest.

hollyfox’s picture

I am seeing this as well and I just upgraded to OA 7x-2.12. I am unable to add any view panes including the OA task pane to any pages. I am not sure if this has something to do with this conflict, but it is stopping me from moving on.

hollyfox’s picture

I was able to revert node overrides and get the admin permissions to work so I am able to add panes now. It still reports that it conflicts with panopoly_users though.

scottalan’s picture

I just ran across this issue and what I'm seeing is a conflict with oa_panopoly_users. This is due to the fact that oa_panopoly_users already defines: features[features_override_items][] = panelizer_defaults.user:user:default and oa_worktracker has a dependency on oa_panopoly_users and it is also defining: features[features_override_items][] = panelizer_defaults.user:user:default in its .info as well. If features[features_override_items][] = panelizer_defaults.user:user:default is removed from oa_worktracker.info then the conflict is resolved.

scottalan’s picture

This fixes the conflict. Since oa_worktracker is dependent on oa_panopoly_users it shouldn't include this override.

scottalan’s picture

Something else I just noticed...

It seems that oa_worktracker also wants to have a dependency on oa_layouts because oa_layouts defines: features[panelizer_defaults][] = node:oa_section:default and oa_worktracker then uses: features[panelizer_defaults][] = node:oa_section:oa_section_worktracker. I might be wrong about this as I'm just getting into figuring out how this export works but I don't see anything else that would cause oa_worktracker to want to add this dependency.

oa_worktracker also wants to add a variable: features[variable][] = panelizer_defaults_user_user. I'm not sure why it is trying to do this. It seems that this is handled by the: features[features_override_items][] = panelizer_defaults.user:user:default that exists in oa_panopoly_users but I'm not sure about that.

Should the variable be added or should it be excluded: features_exclude[variable][panelizer_defaults_user_user] = panelizer_defaults_user_user?

With the variable excluded from features this is what I end up with in my drush fd oa_worktracker:

Component type: field_instance
          'type' => 'entityreference_label',
          'weight' => 7,
>       ),
>       'message_notify_daily_digest' => array(
>         'label' => 'above',
>         'type' => 'hidden',
        ),
        'message_notify_email_body' => array(
          'type' => 'hidden',
          'weight' => 5,
>       ),
>       'message_notify_weekly_digest' => array(
>         'label' => 'above',
>         'type' => 'hidden',
        ),
        'oa_river_accordian' => array(
          'type' => 'entityreference_label',
          'weight' => 2,
>       ),
>       'message_notify_daily_digest' => array(
>         'label' => 'above',
>         'type' => 'hidden',
        ),
        'message_notify_email_body' => array(
          'type' => 'hidden',
          'weight' => 7,
>       ),
>       'message_notify_weekly_digest' => array(
>         'label' => 'above',
>         'type' => 'hidden',
        ),
        'oa_river_accordian' => array(
          'module' => 'entityreference',
          'type' => 'entityreference_label',
>       ),
>       'message_notify_daily_digest' => array(
>         'label' => 'above',
>         'type' => 'hidden',
        ),
        'message_notify_email_body' => array(
          'type' => 'hidden',
          'weight' => 8,
>       ),
>       'message_notify_weekly_digest' => array(
>         'label' => 'above',
>         'type' => 'hidden',
        ),
        'oa_river_accordian' => array(
          'type' => 'text_default',
          'weight' => 4,
>       ),
>       'message_notify_daily_digest' => array(
>         'label' => 'above',
>         'type' => 'hidden',
        ),
        'message_notify_email_body' => array(
          'type' => 'hidden',
          'weight' => 6,
>       ),
>       'message_notify_weekly_digest' => array(
>         'label' => 'above',
>         'type' => 'hidden',
        ),
        'oa_river_accordian' => array(
          'type' => 'entityreference_label',
          'weight' => 6,
>       ),
>       'message_notify_daily_digest' => array(
>         'label' => 'above',
>         'type' => 'hidden',
        ),
        'message_notify_email_body' => array(
          'type' => 'hidden',
          'weight' => 9,
>       ),
>       'message_notify_weekly_digest' => array(
>         'label' => 'above',
>         'type' => 'hidden',
        ),
        'oa_river_accordian' => array(

After some explanation from mpotter on why OA doesn't want to add the above to the feature I assume the same goes for oa_worktracker as it would cause the feature to be overridden again if message_digest was disabled as those message types are only available when that module is enabled.

The problem I see is that how do you get the diff below updated without adding the digest stuff above and then having to manually remove it??

Component type: dependencies
    0 => 'comment',
    1 => 'comment_alter',
<   2 => 'ctools',
<   3 => 'defaultconfig',
<   4 => 'entityreference',
<   5 => 'features',
<   6 => 'field_group',
<   7 => 'file',
<   8 => 'media',
<   9 => 'message',
    10 => 'node',
<   11 => 'oa_core (>2.10)',
    12 => 'oa_layouts',
    13 => 'oa_media',
    18 => 'options_element',
    19 => 'panelizer',
>   2 => 'ctools',
    20 => 'panopoly_users',
    21 => 'strongarm',
    24 => 'views',
    25 => 'views_content',
>   3 => 'defaultconfig',
>   4 => 'entityreference',
>   5 => 'features',
>   6 => 'field_group',
>   7 => 'file',
>   8 => 'media',
>   9 => 'message',
  )

Any suggestions?

scottalan’s picture

I was able to get rid of the overridden dependencies by changing: < 11 => 'oa_core (>2.10)', in the above diff to just oa_core. It seems features doesn't like the version check?

dsnopek’s picture

Version: 7.x-2.0-beta6 » 7.x-2.x-dev
Status: Active » Fixed

Committed the patch in #8:

http://drupalcode.org/project/oa_worktracker.git/commit/3bc225cc44ea5ed3...

(Ignore! This is the wrong commit.)

Thanks!

dsnopek’s picture

Status: Fixed » Needs review

Gah, hang on! I somehow totally messed up the Git repo. :-/

scottalan’s picture

Ha, I thought something seemed off.

dsnopek’s picture

Status: Needs review » Fixed

Here's the real commit this time:

http://drupalcode.org/project/oa_worktracker.git/commit/58c7f971f211db8e...

Now to fix the other commits I broke...

Status: Fixed » Closed (fixed)

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