Merge pull request #1145 from AndreasK79/qsl_print_mark_sent_bugfix
[QSLPrint] Fixed marking of QSLs as sent when station location was all.
这个提交包含在:
当前提交
e3864078b0
共有 2 个文件被更改,包括 3 次插入 和 3 次删除
|
|
@ -115,8 +115,8 @@ class QSLPrint extends CI_Controller {
|
||||||
|
|
||||||
function qsl_printed() {
|
function qsl_printed() {
|
||||||
|
|
||||||
if ($this->uri->segment(3) == 'All') {
|
if ($this->uri->segment(3) == 'all') {
|
||||||
$station_id = NULL;
|
$station_id = 'All';
|
||||||
} else {
|
} else {
|
||||||
$station_id = $this->security->xss_clean($this->uri->segment(3));
|
$station_id = $this->security->xss_clean($this->uri->segment(3));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ class Qslprint_model extends CI_Model {
|
||||||
|
|
||||||
if ($station_id2 == NULL) {
|
if ($station_id2 == NULL) {
|
||||||
$this->db->where("station_id", $station_id);
|
$this->db->where("station_id", $station_id);
|
||||||
} else {
|
} else if ($station_id2 != 'All') {
|
||||||
$this->db->where("station_id", $station_id2);
|
$this->db->where("station_id", $station_id2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用