LBRYCommunity/block-explorer
1
0
Fork 0
Code Issues 31 Pull requests 4 Projects Releases Packages Wiki Activity

Chainquery integration #49

Merged
marcdeb1 merged 44 commits from chainquery into master 2019-02-13 19:01:13 +01:00
Conversation 25 Commits 44 Files changed 36 +6 -5
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 94682cc4d4 - Show all commits

7
src/Controller/MainController.php
View file

@ -381,6 +381,8 @@ class MainController extends AppController {
public function blocks($height = null) { public function blocks($height = null) {
$this->loadModel('Blocks'); $this->loadModel('Blocks');
$this->loadModel('Outputs');
$this->loadModel('Transactions');
if ($height === null) { if ($height === null) {
// paginate blocks // paginate blocks
@ -413,7 +415,6 @@ class MainController extends AppController {
$this->set('numRecords', $numBlocks); $this->set('numRecords', $numBlocks);
$this->set('currentPage', $page); $this->set('currentPage', $page);
} else { } else {
$this->loadModel('Transactions');
$height = intval($height); $height = intval($height);
if ($height < 0) { if ($height < 0) {
return $this->redirect('/'); return $this->redirect('/');
@ -425,7 +426,8 @@ class MainController extends AppController {
} }
// Get the basic block transaction info // Get the basic block transaction info
$txs = $this->Transactions->find()->select(['input_count', 'output_count', 'hash', 'version'])->where(['block_hash_id' => $block->hash])->toArray(); $txs = $this->Transactions->find()->select(['id', 'input_count', 'output_count', 'hash', 'version'])->where(['block_hash_id' => $block->hash])->toArray();
$this->set('block', $block); $this->set('block', $block);
$this->set('blockTxs', $txs); $this->set('blockTxs', $txs);
@ -444,6 +446,7 @@ class MainController extends AppController {
$tx = $this->Transactions->find()->select( $tx = $this->Transactions->find()->select(
['id', 'block_hash_id', 'input_count', 'output_count', 'hash', 'transaction_time', 'transaction_size', 'created_at', 'version', 'lock_time', 'raw'])->where(['hash' => $hash])->first(); ['id', 'block_hash_id', 'input_count', 'output_count', 'hash', 'transaction_time', 'transaction_size', 'created_at', 'version', 'lock_time', 'raw'])->where(['hash' => $hash])->first();
$tx->value = $tx->value();
if (!$tx) { if (!$tx) {
return $this->redirect('/'); return $this->redirect('/');
} }

4
src/Template/Main/blocks.ctp
View file

@ -29,13 +29,11 @@
</div> </div>
<div class="block-nav"> <div class="block-nav">
<?php if (strlen(trim($block->previous_block_hash)) > 0): ?> <?php if ($block->height > 0): ?>
<a class="btn btn-prev" href="/blocks/<?php echo ($block->height - 1); ?>">&laquo; Previous Block</a> <a class="btn btn-prev" href="/blocks/<?php echo ($block->height - 1); ?>">&laquo; Previous Block</a>
<?php endif; ?> <?php endif; ?>
<?php if (strlen(trim($block->next_block_hash)) > 0): ?>
<a class="btn btn-next" href="/blocks/<?php echo ($block->height + 1); ?>">Next Block &raquo;</a> <a class="btn btn-next" href="/blocks/<?php echo ($block->height + 1); ?>">Next Block &raquo;</a>
<?php endif; ?>
<div class="clear"></div> <div class="clear"></div>
</div> </div>