Skip to content

Commit

Permalink
Another critical bug fix. The wrong id was used to set the publisher …
Browse files Browse the repository at this point in the history
…markup rate.
  • Loading branch information
Christopher Gu committed Dec 15, 2014
1 parent 105cbbd commit 02ca74f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function indexAction()
// admin is logged in as a user, get the markup if any for that user
if ($this->EffectiveID != 0):

$publisher_markup = \util\Markup::getMarkupForPublisher($this->EffectiveID, $this->config_handle, false);
$publisher_markup = \util\Markup::getMarkupForPublisher($this->PublisherInfoID, $this->config_handle, false);
if ($publisher_markup != null):
$publisher_markup_rate = $publisher_markup->MarkupRate;
endif;
Expand Down Expand Up @@ -90,6 +90,7 @@ public function indexAction()
'domain_owner' => isset($PublisherInfo->Name) ? $PublisherInfo->Name : "",
'impersonate_id' => $this->ImpersonateID,
'effective_id' => $this->auth->getEffectiveIdentityID(),
'publisher_info_id' => $this->PublisherInfoID,
'dashboard_view' => 'publisher',
'user_identity' => $this->identity(),
'publisher_markup_rate' => $publisher_markup_rate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $effective_user_in_dashboard = false;
<?php if ($effective_id != 0 && $effective_user_in_dashboard === true): ?>

<form name="changepublishermarkup" id="changepublishermarkup" action="/publisher/changepublishermarkup"class="forms pull-right" >
<input type="hidden" name="markuppublisherinfoid" value="<?php echo $effective_id;?>" />
<input type="hidden" name="markuppublisherinfoid" value="<?php echo $publisher_info_id;?>" />

<span style="font-size: 12px; font-weight: bold;">Publisher Markup Rate:</span> <input type="text" style="text-align: right" name="publisher-markup" class="span1" value="<?php echo $publisher_markup_rate;?>">%

Expand Down

0 comments on commit 02ca74f

Please sign in to comment.