Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deal override fix to resolve #618 #619

Merged
merged 1 commit into from
Sep 15, 2016
Merged

Conversation

indexexchange
Copy link
Contributor

@indexexchange indexexchange commented Sep 12, 2016

Type of change

  • Bugfix
  • Feature
  • New bidder adapter
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Other

Description of change

Change the following code to getDealTargeting last

function getAllTargeting() {
    // Get targeting for the winning bid. Add targeting for any bids that have                                                                                                                                                             
    // `alwaysUseBid=true`. If sending all bids is enabled, add targeting for losing bids.                                                                                                                                                 
    var targeting = getDealTargeting()
        .concat(getWinningBidTargeting())
        .concat(getAlwaysUseBidTargeting())
        .concat($$PREBID_GLOBAL$$._sendAllBids ? getBidLandscapeTargeting() : []);

@mkendall07
Copy link
Member

@indexexchange
Please include a unit test that asserts this change. Thanks!

Copy link
Collaborator

@protonate protonate left a comment

Choose a reason for hiding this comment

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

Looks good, tests are green. In the case where bid landscape info and deal info collide, we should prefer the deal info. However it may be we need to prevent the key name collision to begin with.

@protonate protonate merged commit d06b036 into prebid:master Sep 15, 2016
marian-r added a commit to aol/Prebid.js that referenced this pull request Sep 23, 2016
…3.0 to master

* commit '9d4bc7fda6bcc249544fb8636b98e90fdc8d474b': (44 commits)
  Added support for new adapters introduced in 0.13.0 into AOL analytics
  Updated CHANGELOG
  Fixed merge conflict
  Prebid 0.13.0 Release
  Resolves prebid#635 (prebid#640)
  Add IX Deal Support (prebid#638)
  Bug fix: accept custom timeout prebid#582 & prebid#604 (prebid#641)
  added timeouts to rubicon adapter that consider time-to-start costs (prebid#629)
  Modify handling of no-bids in Krux Link adapter (prebid#628)
  Allow bypassing ajax preflights with config options (prebid#630)
  validateIndentation: Invalid indentation character (prebid#631)
  use `splice` rather than `slice` to remove bids from array (prebid#637)
  delete the callback before calling clearAuction (prebid#636)
  Deal override fix to resolve prebid#618 (prebid#619)
  Update package.json
  Video - create mastertagUrl from adservertag (prebid#614)
  Prevent renderAd from rendering videos (prebid#623)
  Remove unused build depencencies (prebid#622)
  Add pull request template (prebid#615)
  Openx adaptor deal update (prebid#612)
  ...
Studnicky pushed a commit to sonobi/Prebid.js that referenced this pull request Oct 4, 2016
Studnicky pushed a commit to sonobi/Prebid.js that referenced this pull request Oct 4, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants