Chainquery integration #49

Merged
marcdeb1 merged 44 commits from chainquery into master 2019-02-13 19:01:13 +01:00
4 changed files with 2 additions and 24 deletions
Showing only changes of commit f3564d7809 - Show all commits

View file

@ -435,7 +435,7 @@ class MainController extends AppController {
$this->loadModel('Transactions'); $this->loadModel('Transactions');
$this->loadModel('Inputs'); $this->loadModel('Inputs');
$this->loadModel('Outputs'); $this->loadModel('Outputs');
$this->loadModel('TransactionAddress'); $this->loadModel('TransactionAddresses');
if (!$addr) { if (!$addr) {
return $this->redirect('/'); return $this->redirect('/');
@ -465,7 +465,7 @@ class MainController extends AppController {
$conn = ConnectionManager::get('default'); $conn = ConnectionManager::get('default');
$canTag = true; $canTag = true;
$transactionAddresses = $this->TransactionAddress->find()->where(['address_id' => $address->id])->toArray(); $transactionAddresses = $this->TransactionAddresses->find()->where(['address_id' => $address->id])->toArray();
$numTransactions = count($transactionAddresses); $numTransactions = count($transactionAddresses);
$all = $this->request->query('all'); $all = $this->request->query('all');
@ -761,7 +761,6 @@ class MainController extends AppController {
public function apiaddrbalance($base58address = null) { public function apiaddrbalance($base58address = null) {
$this->autoRender = false; $this->autoRender = false;
$this->loadModel('Addresses'); $this->loadModel('Addresses');
$this->loadModel('TransactionAddress');
if (!isset($base58address)) { if (!isset($base58address)) {
return $this->_jsonError('Base58 address not specified.', 400); return $this->_jsonError('Base58 address not specified.', 400);

View file

@ -5,9 +5,6 @@ namespace App\Model\Entity;
use Cake\ORM\Entity; use Cake\ORM\Entity;
class Block extends Entity { class Block extends Entity {
public function target() {
}
} }

View file

@ -24,5 +24,4 @@ class ClaimsTable extends Table {
]); ]);
} }
} }
?> ?>

View file

@ -1,17 +0,0 @@
<?php
namespace App\Model\Table;
use Cake\ORM\Table;
class TransactionAddressesTable extends Table {
public function initialize(array $config) {
parent::initialize($config);
$this->table('transaction_address');
$this->addBehavior('SimpleAudit');
}
}
?>