Fix for #2, if dxcc info is not in the adif, and the user wants to get it from the adif, we will still look it up if it's not included.
这个提交包含在:
父节点
c896e5d909
当前提交
bf24cff4aa
共有 2 个文件被更改,包括 3 次插入 和 2 次删除
|
|
@ -1525,7 +1525,7 @@ class Logbook_model extends CI_Model {
|
||||||
$entity = $this->get_entity($record['dxcc']);
|
$entity = $this->get_entity($record['dxcc']);
|
||||||
$dxcc = array($record['dxcc'], $entity['name']);
|
$dxcc = array($record['dxcc'], $entity['name']);
|
||||||
} else {
|
} else {
|
||||||
$dxcc = NULL;
|
$dxcc = $this->check_dxcc_table($record['call'], $time_off);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$dxcc = $this->check_dxcc_table($record['call'], $time_off);
|
$dxcc = $this->check_dxcc_table($record['call'], $time_off);
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,8 @@
|
||||||
<input class="form-check-input" type="checkbox" name="dxccAdif" value="1" id="dxccAdif">
|
<input class="form-check-input" type="checkbox" name="dxccAdif" value="1" id="dxccAdif">
|
||||||
<label class="form-check-label" for="dxccAdif">Use DXCC information from ADIF</label>
|
<label class="form-check-label" for="dxccAdif">Use DXCC information from ADIF</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="small form-text text-muted">If not selected, Cloudlog will attempt to determine DXCC information automatically.</div>
|
<div class="small form-text text-muted">If not selected, Cloudlog will attempt to determine DXCC information automatically.<br/>
|
||||||
|
If selected, we will import from ADIF, but determine if not included in entries.</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用