diff options
author | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-06-15 12:10:53 +0300 |
---|---|---|
committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-06-15 12:10:53 +0300 |
commit | 1a11a9613455f249ceda7b1a3a51cc8f13571b71 (patch) | |
tree | ef36296a88e117723d74f8815a32418fb2279f0e | |
parent | cbf0ef1f24d8299ca98cc85f959fdaa76827b2b6 (diff) |
Do not call these functions twice
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
-rw-r--r-- | js/pmd/history.js | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/js/pmd/history.js b/js/pmd/history.js index e316138f4e..4269818d12 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -731,14 +731,28 @@ function build_query(formtitle, fadin) } else { q_select += "* "; } + q_select += "\nFROM " + query_from(); - if (query_where() !== "") { - q_select += "\nWHERE "; - q_select += query_where(); + + var q_where = query_where(); + if (q_where !== "") { + q_select += "\nWHERE " + q_where; + } + + var q_groupby = query_groupby(); + if (q_groupby !== "") { + q_select += "\nGROUP BY " + q_groupby; + } + + var q_having = query_having(); + if (q_having !== "") { + q_select += "\nHAVING " + q_having; + } + + var q_orderby = query_orderby(); + if (q_orderby !== "") { + q_select += "\nORDER BY " + q_orderby; } - if (query_groupby() !== "") { q_select += "\nGROUP BY " + query_groupby(); } - if (query_having() !== "") { q_select += "\nHAVING " + query_having(); } - if (query_orderby() !== "") { q_select += "\nORDER BY " + query_orderby(); } /** * @var button_options Object containing options |