projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set maxrecs=1
[mkws-moved-to-github.git]
/
src
/
mkws-team.js
diff --git
a/src/mkws-team.js
b/src/mkws-team.js
index
828b049
..
895afed
100644
(file)
--- a/
src/mkws-team.js
+++ b/
src/mkws-team.js
@@
-127,6
+127,7
@@
function team($, teamName) {
function onShow(data, teamName) {
log("show");
m_totalRecordCount = data.merged;
function onShow(data, teamName) {
log("show");
m_totalRecordCount = data.merged;
+ log("found " + m_totalRecordCount + " records");
queue("pager").publish(data);
queue("records").publish(data);
}
queue("pager").publish(data);
queue("records").publish(data);
}
@@
-249,7
+250,7
@@
function team($, teamName) {
that.resetPage = resetPage;
that.resetPage = resetPage;
- function newSearch(query, sortOrder, perpage, targets) {
+ function newSearch(query, sortOrder, perpage, limit, targets, torusquery) {
log("newSearch: " + query);
if (m_config.use_service_proxy && !mkws.authenticated) {
log("newSearch: " + query);
if (m_config.use_service_proxy && !mkws.authenticated) {
@@
-258,19
+259,19
@@
function team($, teamName) {
}
m_filters = []
}
m_filters = []
- triggerSearch(query, sortOrder, perpage, targets);
+ triggerSearch(query, sortOrder, perpage, limit, targets, torusquery);
switchView('records'); // In case it's configured to start off as hidden
m_submitted = true;
}
that.newSearch = newSearch;
switchView('records'); // In case it's configured to start off as hidden
m_submitted = true;
}
that.newSearch = newSearch;
- function triggerSearch(query, sortOrder, perpage, targets) {
+ function triggerSearch(query, sortOrder, perpage, limit, targets, torusquery) {
resetPage();
queue("navi").publish();
var pp2filter = "";
resetPage();
queue("navi").publish();
var pp2filter = "";
- var pp2limit = "";
+ var pp2limit = limit || "";
// Continue to use previous query/sort-order unless new ones are specified
if (query) {
// Continue to use previous query/sort-order unless new ones are specified
if (query) {
@@
-308,6
+309,11
@@
function team($, teamName) {
if (pp2limit) {
params.limit = pp2limit;
}
if (pp2limit) {
params.limit = pp2limit;
}
+ if (torusquery) {
+ if (!mkws.config.use_service_proxy)
+ alert("can't narrow search by torusquery when Service Proxy is not in use");
+ params.torusquery = torusquery;
+ }
log("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", " +
"pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
log("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", " +
"pp2filter = " + pp2filter + ", params = " + $.toJSON(params));