Skip to content

Commit

Permalink
closes #456
Browse files Browse the repository at this point in the history
  • Loading branch information
benkeen committed Jun 30, 2019
1 parent 60654d0 commit 3555e85
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions resources/classes/DataGenerator.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class DataGenerator {
private $isLastBatch;
private $currentBatchFirstRow;
private $currentBatchLastRow;

// compression flag - set as per user choice
private $isCompressionRequired = false;

Expand Down Expand Up @@ -162,6 +162,7 @@ private function applyRowsGeneratedLimit() {
$this->numResults = $maxDemoModeRows;
}
}

// always apply the max generated rows limitation. Technically this value could be lower than
// the $maxDemoModeRows value above, but it's extremely unlikely & an acceptable restriction
$maxGeneratedRows = Core::getMaxGeneratedRows();
Expand Down Expand Up @@ -438,7 +439,7 @@ public function getCurrentBatchFirstRow() {
public function getCurrentBatchLastRow() {
return $this->currentBatchLastRow;
}

public function isPromptDownloadZipped(){
return $this->isCompressionRequired;
}
Expand Down
8 changes: 4 additions & 4 deletions resources/templates/generate.tab1.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<div id="gdGenerateSubtab1">
<input type="text" id="gdDataSetName" placeholder="{$L.your_data_set_name_here}" /><button type="button" id="gdSaveBtn">{$L.save|upper}</button>
<div class="gdClear" style="padding-bottom: 20px"></div>
<div class="gdClear" style="padding-bottom: 20px"></div>

<h2>
{$L.country_specific_data|upper}
Expand Down Expand Up @@ -81,10 +81,10 @@
</div>
<div class="gdClear"></div>

<div id="gdGenerateSection">
<div id="gdGenerateSection">
<button style="float: right" class="gdPrimaryButton" id="gdGenerateButton">{$L.generate}</button>
{$L.generate} <input type="text" name="gdNumRowsToGenerate" id="gdNumRowsToGenerate" value="{$defaultNumRows}"
{if $inDemoMode || !$isLoggedIn}readonly="readonly"{/if} /> {$L.rows}
{$L.generate} <input type="text" name="gdNumRowsToGenerate" id="gdNumRowsToGenerate" value="{$defaultNumRows}"
{if $inDemoMode && !$isLoggedIn}readonly="readonly"{/if} /> {$L.rows}
<span>
<input type="radio" name="gdExportTarget" id="gdExportTarget_inPage" value="inPage" checked="checked" />
<label for="gdExportTarget_inPage" id="gdExportTarget_inPage_label">{$L.generate_in_page}</label>
Expand Down

0 comments on commit 3555e85

Please sign in to comment.