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
Use <div></div> instead of <div/>
[mkws-moved-to-github.git]
/
src
/
mkws-team.js
diff --git
a/src/mkws-team.js
b/src/mkws-team.js
index
8a78520
..
716b920
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);
}
@@
-170,8
+171,7
@@
function team($, teamName) {
};
};
- that.limitTarget = function(id, name)
- {
+ that.limitTarget = function(id, name) {
log("limitTarget(id=" + id + ", name=" + name + ")");
m_filters.push({ id: id, name: name });
triggerSearch();
log("limitTarget(id=" + id + ", name=" + name + ")");
m_filters.push({ id: id, name: name });
triggerSearch();
@@
-179,8
+179,7
@@
function team($, teamName) {
};
};
- that.limitQuery = function(field, value)
- {
+ that.limitQuery = function(field, value) {
log("limitQuery(field=" + field + ", value=" + value + ")");
m_filters.push({ field: field, value: value });
triggerSearch();
log("limitQuery(field=" + field + ", value=" + value + ")");
m_filters.push({ field: field, value: value });
triggerSearch();
@@
-188,8
+187,7
@@
function team($, teamName) {
};
};
- that.delimitTarget = function(id)
- {
+ that.delimitTarget = function(id) {
log("delimitTarget(id=" + id + ")");
removeMatchingFilters(function(f) { return f.id });
triggerSearch();
log("delimitTarget(id=" + id + ")");
removeMatchingFilters(function(f) { return f.id });
triggerSearch();
@@
-197,8
+195,7
@@
function team($, teamName) {
};
};
- that.delimitQuery = function(field, value)
- {
+ that.delimitQuery = function(field, value) {
log("delimitQuery(field=" + field + ", value=" + value + ")");
removeMatchingFilters(function(f) { return f.field && field == f.field && value == f.value });
triggerSearch();
log("delimitQuery(field=" + field + ", value=" + value + ")");
removeMatchingFilters(function(f) { return f.field && field == f.field && value == f.value });
triggerSearch();
@@
-221,8
+218,7
@@
function team($, teamName) {
}
}
- that.showPage = function(pageNum)
- {
+ that.showPage = function(pageNum) {
m_currentPage = pageNum;
m_paz.showPage(m_currentPage - 1);
};
m_currentPage = pageNum;
m_paz.showPage(m_currentPage - 1);
};
@@
-247,16
+243,14
@@
function team($, teamName) {
};
};
- function resetPage()
- {
+ function resetPage() {
m_currentPage = 1;
m_totalRecordCount = 0;
}
that.resetPage = resetPage;
m_currentPage = 1;
m_totalRecordCount = 0;
}
that.resetPage = resetPage;
- function newSearch(query, sortOrder, perpage, targets)
- {
+ function newSearch(query, sortOrder, maxrecs, 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) {
@@
-265,20
+259,19
@@
function team($, teamName) {
}
m_filters = []
}
m_filters = []
- triggerSearch(query, sortOrder, perpage, targets);
+ triggerSearch(query, sortOrder, maxrecs, 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, maxrecs, 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) {
@@
-316,6
+309,14
@@
function team($, teamName) {
if (pp2limit) {
params.limit = pp2limit;
}
if (pp2limit) {
params.limit = pp2limit;
}
+ if (maxrecs) {
+ params.maxrecs = maxrecs;
+ }
+ 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));
@@
-601,8
+602,7
@@
function team($, teamName) {
}
}
- function renderDetails(data, marker)
- {
+ function renderDetails(data, marker) {
var template = loadTemplate("Record");
var details = template(data);
return '<div class="details mkwsTeam_' + m_teamName + '" ' +
var template = loadTemplate("Record");
var details = template(data);
return '<div class="details mkwsTeam_' + m_teamName + '" ' +
@@
-611,8
+611,7
@@
function team($, teamName) {
that.renderDetails = renderDetails;
that.renderDetails = renderDetails;
- function loadTemplate(name)
- {
+ function loadTemplate(name) {
var template = m_template[name];
if (template === undefined) {
var template = m_template[name];
if (template === undefined) {
@@
-637,8
+636,7
@@
function team($, teamName) {
that.loadTemplate = loadTemplate;
that.loadTemplate = loadTemplate;
- function defaultTemplate(name)
- {
+ function defaultTemplate(name) {
if (name === 'Record') {
return '\
<table>\
if (name === 'Record') {
return '\
<table>\
@@
-710,6
+708,15
@@
function team($, teamName) {
<span><i>{{md-title-responsibility}}</i></span>\
{{/if}}\
';
<span><i>{{md-title-responsibility}}</i></span>\
{{/if}}\
';
+ } else if (name === "Image") {
+ return '\
+ <a href="#" id="{{_id}}" onclick="{{_onclick}}">\
+ {{#first md-thumburl}}\
+ <img src="{{this}}" alt="{{../md-title}}"/>\
+ {{/first}}\
+ <br/>\
+ </a>\
+';
}
var s = "There is no default '" + name +"' template!";
}
var s = "There is no default '" + name +"' template!";