Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 71a0ab7f

Přidáno uživatelem Tomáš Pašek před téměř 4 roky(ů)

Feature #8345 Implementce filterů dat - Server

oprava vracení manuscriptů

Zobrazit rozdíly:

application/controller/TableController.php
8 8
$parArray = Array();
9 9
$whereQuery = createWhereQuery($parArray);
10 10

  
11
if (array_key_exists("manuscript", $_POST) && $_POST['manuscript'] != "") {
12
    $results = $DB->select(
11
$results = $DB->select(
13 12
        "SELECT w.id, w.context, w.date, w.description, w.description2, w.description3, w.ending, w.finished,
14 13
w.namedentity, w.position1, w.position2, w.positiondetail, w.word, w.tag_id, w.lemma_id, t.tag, l.lemma, m.manuscript,
15 14
l.pos FROM dd_manuscript as m left join dd_wordform as w on m.wordform_id = w.id left join dd_tag as t on w.tag_id = t.id left join dd_lemma as l on w.lemma_id = l.id ".$whereQuery." order by w.id", $parArray);
16
} else {
17
    $results = $DB->select(
18
        "SELECT w.id, w.context, w.date, w.description, w.description2, w.description3, w.ending, w.finished,
19
w.namedentity, w.position1, w.position2, w.positiondetail, w.word, w.tag_id, w.lemma_id, t.tag, l.lemma,
20
l.pos FROM dd_wordform as w left join dd_tag as t on w.tag_id = t.id left join dd_lemma as l on w.lemma_id = l.id ".$whereQuery." order by w.id", $parArray);
21
}
22 15

  
23 16
$output = Array();
24 17
$output["data"] = Array();

Také k dispozici: Unified diff