kopia lustrzana https://github.com/magicbug/Cloudlog
Merge remote-tracking branch 'upstream/dev' into fix_dxcc_in_search_result
commit
f672dee671
|
@ -886,8 +886,8 @@ class Logbook extends CI_Controller {
|
||||||
if (isset($callsign['callsign']['error'])) {
|
if (isset($callsign['callsign']['error'])) {
|
||||||
$callsign['error'] = $callsign['callsign']['error'];
|
$callsign['error'] = $callsign['callsign']['error'];
|
||||||
}
|
}
|
||||||
$callsign['id'] = strtoupper($id);
|
|
||||||
|
|
||||||
|
$callsign['id'] = strtoupper($id);
|
||||||
return $this->load->view('search/result', $callsign, true);
|
return $this->load->view('search/result', $callsign, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,10 +22,12 @@
|
||||||
<td style="padding: 0.3em 0 0.3em 0.5em;" align="left"><?php echo $callsign['city']; ?></td>
|
<td style="padding: 0.3em 0 0.3em 0.5em;" align="left"><?php echo $callsign['city']; ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
<?php if(isset($callsign['dxcc_name'])) { ?>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="padding: 0 0.3em 0 0;" align="left">DXCC</td>
|
<td style="padding: 0 0.3em 0 0;" align="left">DXCC</td>
|
||||||
<td style="padding: 0.3em 0 0.3em 0.5em;" align="left"><?php echo $callsign['dxcc_name']; ?></td>
|
<td style="padding: 0.3em 0 0.3em 0.5em;" align="left"><?php echo $callsign['dxcc_name']; ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td style="padding: 0 0.3em 0 0;" align="left">Gridsquare</td>
|
<td style="padding: 0 0.3em 0 0;" align="left">Gridsquare</td>
|
||||||
|
|
Ładowanie…
Reference in New Issue