0x2620/cablegates
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge changes

Browse source
This commit is contained in:
j 2010-09-18 10:09:28 +02:00
commit 2ef516aad4
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pandora/static/js/pandora.js
View file

@ -183,7 +183,7 @@ app.Query = (function() {
} }
}) : []), }) : []),
operator = conditions.length < 2 ? '' : ','; // fixme: should be & operator = conditions.length < 2 ? '' : ','; // fixme: should be &
Ox.print(groupId, app.user.ui.find, conditions); Ox.print('>>', groupId, app.user.ui.find, conditions);
return { return {
conditions: conditions, conditions: conditions,
operator: operator operator: operator
@ -393,8 +393,8 @@ app.constructApp = function() {
} }
app.constructGroups = function() { app.constructGroups = function() {
$groups = []; var $groups = [],
var panelWidth = app.$document.width() - app.user.ui.listsSize - 1; panelWidth = app.$document.width() - app.user.ui.listsSize - 1;
app.ui.groups = $.map(app.config.groups, function(id, i) { app.ui.groups = $.map(app.config.groups, function(id, i) {
var title = Ox.getObjectById(app.config.sortKeys, id).title, var title = Ox.getObjectById(app.config.sortKeys, id).title,
width = app.getGroupWidth(i, panelWidth); width = app.getGroupWidth(i, panelWidth);
@ -457,6 +457,7 @@ app.constructGroups = function() {
}); });
$.each(app.ui.groups, function(i_, group_) { $.each(app.ui.groups, function(i_, group_) {
if (i_ != i) { if (i_ != i) {
Ox.print('setting groups request', i, i_)
app.$ui.groups[i_].options({ app.$ui.groups[i_].options({
request: function(data, callback) { request: function(data, callback) {
delete data.keys; delete data.keys;
@ -1523,8 +1524,8 @@ app.constructToolbar = function() {
operator: '' operator: ''
} }
]; ];
$.each(groups, function(i, group) { $.each(app.ui.groups, function(i, group) {
groups[i].query.conditions = []; group.query.conditions = [];
app.$ui.groups[i].options({ app.$ui.groups[i].options({
request: function(data, callback) { request: function(data, callback) {
delete data.keys; delete data.keys;

2
pandora/templates/pandora.json
View file

@ -108,7 +108,7 @@
"preferences": {}, "preferences": {},
"ui": { "ui": {
"columns": ["id", "title", "director", "country", "year", "language", "genre"], "columns": ["id", "title", "director", "country", "year", "language", "genre"],
"findQuery": {"conditions": [{"key": "", "value": "", "operator": ""}], "operator": ""}, "findQuery": {"conditions": [], "operator": ""},
"groupsQuery": {"conditions": [], "operator": "|"}, "groupsQuery": {"conditions": [], "operator": "|"},
"groupsSize": 128, "groupsSize": 128,
"itemView": "info", "itemView": "info",