},
});
+SliceSelectorOption = Marionette.ItemView.extend({
+ template: "#xos-sliceselector-option",
+ tagName: "option",
+ attributes: function() {
+ if (this.options.selectedID == this.model.get("id")) {
+ return { value: this.model.get("id"), selected: 1 };
+ } else {
+ return { value: this.model.get("id") };
+ }
+ },
+});
+
+SliceSelectorView = Marionette.CompositeView.extend({
+ template: "#xos-sliceselector-select",
+ childViewContainer: "select",
+ childView: SliceSelectorOption,
+ caption: "Slice",
+
+ events: {"change select": "onSliceChanged"},
+
+ childViewOptions: function() {
+ return { selectedID: this.options.selectedID || this.selectedID || null };
+ },
+
+ onSliceChanged: function() {
+ this.sliceChanged(this.$el.find("select").val());
+ },
+
+ sliceChanged: function(id) {
+ console.log("sliceChanged " + id);
+ },
+
+ templateHelpers: function() { return {caption: this.options.caption || this.caption }; },
+});
+
FilteredCompositeView = Marionette.CompositeView.extend( {
showCollection: function() {
var ChildView;
\r
onRoute: function(x,y,z) {\r
this.routeStack.push(Backbone.history.fragment);\r
+ this.routeStack = this.routeStack.slice(-32); // limit the size of routeStack to something reasonable\r
},\r
\r
prevPage: function() {\r
showPreviousURL: function() {
prevPage = this.prevPage();
- console.log("showPreviousURL");
- console.log(this.routeStack);
+ //console.log("showPreviousURL");
+ //console.log(this.routeStack);
if (prevPage) {
this.navigate("#"+prevPage, {trigger: false, replace: true} );
}
},
- });\r
-
+ navigate: function(href, options) {
+ if (options.force) {
+ Marionette.AppRouter.prototype.navigate.call(this, "nowhere", {trigger: false, replace: true});
+ }
+ Marionette.AppRouter.prototype.navigate.call(this, href, options);
+ },
+ });\r
+\r
+// XXX - We import backbone multiple times (BAD!) since the import happens\r
+// inside of the view's html. The second time it's imported (developer\r
+// view), it wipes out Backbone.Syphon. So, save it as Backbone_Syphon for\r
+// now.\r
+Backbone_Syphon = Backbone.Syphon\r
+Backbone_Syphon.InputReaders.register('select', function(el) {\r
+ // Modify syphon so that if a select has "syphonall" in the class, then
+ // the value of every option will be returned, regardless of whether of
+ // not it is selected.
+ if (el.hasClass("syphonall")) {
+ result = [];
+ _.each(el.find("option"), function(option) {
+ result.push($(option).val());
+ });
+ return result;
+ }
+ return el.val();
+});
XOSApplication = Marionette.Application.extend({
detailBoxId: "#detailBox",
parsed_error=undefined;
width=640; // django stacktraces like wide width
}
+ console.log(responseText);
+ console.log(parsed_error);
if (parsed_error) {
$("#xos-error-dialog").html(templateFromId("#xos-error-response")(parsed_error));
} else {
}
},
+ hideTabs: function() { $("#tabs").hide(); },
+ showTabs: function() { $("#tabs").show(); },
+
createListHandler: function(listViewName, collection_name, regionName, title) {
var app=this;
return function() {
- app[regionName].show(new app[listViewName]);
+ listView = new app[listViewName];
+ app[regionName].show(listView);
app.hideLinkedItems();
$("#contentTitle").html(templateFromId("#xos-title-list")({"title": title}));
$("#detail").show();
- $("#xos-listview-button-box").show();
- $("#tabs").hide();
- $("#xos-detail-button-box").hide();
+ app.hideTabs();
+
+ listButtons = new XOSListButtonView({linkedView: listView});
+ app["rightButtonPanel"].show(listButtons);
}
},
createAddHandler: function(detailName, collection_name, regionName, title) {
var app=this;
return function() {
+ console.log("addHandler");
+
+ app.hideLinkedItems();
+ app.hideTabs();
+
model = new xos[collection_name].model();
detailViewClass = app[detailName];
detailView = new detailViewClass({model: model, collection:xos[collection_name]});
app[regionName].show(detailView);
- $("#xos-detail-button-box").show();
- $("#xos-listview-button-box").hide();
+
+ detailButtons = new XOSDetailButtonView({linkedView: detailView});
+ app["rightButtonPanel"].show(detailButtons);
}
},
var app=this;
return function(parent_modelName, parent_fieldName, parent_id) {
app.Router.showPreviousURL();
- console.log("acs");
- console.log(parent_modelName);
- console.log(parent_fieldName);
- console.log(parent_id);
model = new xos[collection_name].model();
model.attributes[parent_fieldName] = parent_id;
model.readOnlyFields.push(parent_fieldName);
- console.log(model);
detailViewClass = app[addChildName];
var detailView = new detailViewClass({model: model, collection:xos[collection_name]});
detailView.dialog = $("xos-addchild-dialog");
"Save" : function() {
var addDialog = this;
detailView.synchronous = true;
- detailView.afterSave = function() { console.log("afterSave"); $(addDialog).dialog("close"); }
+ detailView.afterSave = function() { console.log("addChild afterSave"); $(addDialog).dialog("close"); }
detailView.save();
//$(this).dialog("close");
detailView = new detailViewClass({model: model});
app[regionName].show(detailView);
detailView.showLinkedItems();
- $("#xos-detail-button-box").show();
- $("#xos-listview-button-box").hide();
+
+ detailButtons = new XOSDetailButtonView({linkedView: detailView});
+ app["rightButtonPanel"].show(detailButtons);
}
}
return showModelId;
that.destroyModel(model);
if (afterDelete=="list") {
that.navigate("list", modelName);
+ } else if (afterDelete) {
+ afterDelete();
}
});
},
});
+XOSButtonView = Marionette.ItemView.extend({
+ events: {"click button.btn-xos-save-continue": "submitContinueClicked",
+ "click button.btn-xos-save-leave": "submitLeaveClicked",
+ "click button.btn-xos-save-another": "submitAddAnotherClicked",
+ "click button.btn-xos-delete": "deleteClicked",
+ "click button.btn-xos-add": "addClicked",
+ "click button.btn-xos-refresh": "refreshClicked",
+ },
+
+ submitLeaveClicked: function(e) {
+ this.options.linkedView.submitLeaveClicked.call(this.options.linkedView, e);
+ },
+
+ submitContinueClicked: function(e) {
+ this.options.linkedView.submitContinueClicked.call(this.options.linkedView, e);
+ },
+
+ submitAddAnotherClicked: function(e) {
+ this.options.linkedView.submitAddAnotherClicked.call(this.options.linkedView, e);
+ },
+
+ submitDeleteClicked: function(e) {
+ this.options.linkedView.deleteClicked.call(this.options.linkedView, e);
+ },
+
+ addClicked: function(e) {
+ this.options.linkedView.addClicked.call(this.options.linkedView, e);
+ },
+
+ refreshClicked: function(e) {
+ this.options.linkedView.refreshClicked.call(this.options.linkedView, e);
+ },
+ });
+
+XOSDetailButtonView = XOSButtonView.extend({ template: "#xos-savebuttons-template" });
+XOSListButtonView = XOSButtonView.extend({ template: "#xos-listbuttons-template" });
+
/* XOSDetailView
extend with:
app - MarionetteApplication
XOSDetailView = Marionette.ItemView.extend({
tagName: "div",
+ viewInitializers: [],
+
events: {"click button.btn-xos-save-continue": "submitContinueClicked",
"click button.btn-xos-save-leave": "submitLeaveClicked",
"click button.btn-xos-save-another": "submitAddAnotherClicked",
*/
initialize: function() {
- this.on("saveSuccess", this.onAfterSave);
+ this.on("saveSuccess", this.onSaveSuccess);
this.synchronous = false;
},
+ onShow: function() {
+ _.each(this.viewInitializers, function(initializer) {
+ initializer();
+ });
+ },
+
+ saveSuccess: function(e) {
+ // always called after a save succeeds
+ },
+
afterSave: function(e) {
+ // if this.synchronous, then called after the save succeeds
+ // if !this.synchronous, then called after save is initiated
},
- onAfterSave: function(e) {
- this.afterSave(e);
+ onSaveSuccess: function(e) {
+ this.saveSuccess(e);
+ if (this.synchronous) {
+ this.afterSave(e);
+ }
},
inputChanged: function(e) {
submitContinueClicked: function(e) {
console.log("saveContinue");
e.preventDefault();
- this.afterSave = function() {};
+ this.afterSave = function() { };
this.save();
},
submitLeaveClicked: function(e) {
console.log("saveLeave");
e.preventDefault();
+ if (this.options.noSubmitButton || this.noSubmitButton) {
+ return;
+ }
var that=this;
this.afterSave = function() {
that.app.navigate("list", that.model.modelName);
submitAddAnotherClicked: function(e) {
console.log("saveAnother");
+ console.log(this);
e.preventDefault();
var that=this;
this.afterSave = function() {
+ console.log("addAnother afterSave");
that.app.navigate("add", that.model.modelName);
}
this.save();
save: function() {
this.app.hideError();
- var data = Backbone.Syphon.serialize(this);
+ var data = Backbone_Syphon.serialize(this);
var that = this;
var isNew = !this.model.id;
+ console.log(data);
+
this.$el.find(".help-inline").remove();
/* although model.validate() is called automatically by
}
if (isNew) {
- this.model.attributes.humanReadableName = "new " + model.modelName;
+ this.model.attributes.humanReadableName = "new " + this.model.modelName;
this.model.addToCollection = this.collection;
} else {
this.model.addToCollection = undefined;
}
- var infoMsgId = this.app.showInformational( {what: "save " + model.modelName + " " + model.attributes.humanReadableName, status: "", statusText: "in progress..."} );
+ var infoMsgId = this.app.showInformational( {what: "save " + this.model.modelName + " " + this.model.attributes.humanReadableName, status: "", statusText: "in progress..."} );
this.model.save(data, {error: function(model, result, xhr) { that.app.saveError(model,result,xhr,infoMsgId);},
success: function(model, result, xhr) { that.app.saveSuccess(model,result,xhr,infoMsgId);
- if (that.synchronous) {
- that.trigger("saveSuccess");
- }
+ that.trigger("saveSuccess");
}});
this.dirty = false;
tabs.push({name: "details", region: "detail"});
+ makeFilter = function(relatedField, relatedId) {
+ return function(model) { return model.attributes[relatedField] == relatedId; }
+ };
+
var index=0;
for (relatedName in this.model.collection.relatedCollections) {
var relatedField = this.model.collection.relatedCollections[relatedName];
relatedListViewClassName = relatedName + "ListView";
assert(this.app[relatedListViewClassName] != undefined, relatedListViewClassName + " not found");
relatedListViewClass = this.app[relatedListViewClassName].extend({collection: xos[relatedName],
- filter: function(model) { return model.attributes[relatedField]==relatedId;},
+ filter: makeFilter(relatedField, relatedId),
parentModel: this.model});
this.app[regionName].show(new relatedListViewClass());
if (this.app.hideTabsByDefault) {
onFormDataInvalid: function(errors) {
var self=this;
var markErrors = function(value, key) {
- console.log("name='" + key + "'");
var $inputElement = self.$el.find("[name='" + key + "']");
var $inputContainer = $inputElement.parent();
//$inputContainer.find(".help-inline").remove();
templateHelpers: function() { return { modelName: this.model.modelName,
collectionName: this.model.collectionName,
addFields: this.model.addFields,
- detailFields: this.model.detailFields,
+ listFields: this.model.listFields,
+ detailFields: this.options.detailFields || this.detailFields || this.model.detailFields,
+ fieldDisplayNames: this.options.fieldDisplayNames || this.fieldDisplayNames || this.model.fieldDisplayNames || {},
foreignFields: this.model.foreignFields,
+ detailLinkFields: this.model.detailLinkFields,
inputType: this.model.inputType,
model: this.model,
+ detailView: this,
+ choices: this.options.choices || this.choices || this.model.choices || {},
+ helpText: this.options.helpText || this.helpText || this.model.helpText || {},
}},
+});
+XOSDetailView_sliver = XOSDetailView.extend( {
+ events: $.extend(XOSDetailView.events,
+ {"change #field_deploymentNetwork": "onDeploymentNetworkChange"}
+ ),
+
+ onShow: function() {
+ // Note that this causes the selects to be updated a second time. The
+ // first time was when the template was originally invoked, and the
+ // selects will all have the full unfiltered set of candidates. Then
+ // onShow will fire, and we'll update them with the filtered values.
+ this.onDeploymentNetworkChange();
+ },
+
+ onDeploymentNetworkChange: function(e) {
+ var deploymentID = this.$el.find("#field_deploymentNetwork").val();
+
+ console.log("onDeploymentNetworkChange");
+ console.log(deploymentID);
+
+ filterFunc = function(model) { return (model.attributes.deployment==deploymentID); }
+ newSelect = idToSelect("node",
+ this.model.attributes.node,
+ this.model.foreignFields["node"],
+ "humanReadableName",
+ false,
+ filterFunc);
+ this.$el.find("#field_node").html(newSelect);
+
+ filterFunc = function(model) { for (index in model.attributes.deployments) {
+ item=model.attributes.deployments[index];
+ if (item.toString()==deploymentID.toString()) return true;
+ };
+ return false;
+ }
+ newSelect = idToSelect("flavor",
+ this.model.attributes.flavor,
+ this.model.foreignFields["flavor"],
+ "humanReadableName",
+ false,
+ filterFunc);
+ this.$el.find("#field_flavor").html(newSelect);
+
+ filterFunc = function(model) { for (index in xos.imageDeployments.models) {
+ imageDeployment = xos.imageDeployments.models[index];
+ if ((imageDeployment.attributes.deployment == deploymentID) && (imageDeployment.attributes.image == model.id)) {
+ return true;
+ }
+ }
+ return false;
+ };
+ newSelect = idToSelect("image",
+ this.model.attributes.image,
+ this.model.foreignFields["image"],
+ "humanReadableName",
+ false,
+ filterFunc);
+ this.$el.find("#field_image").html(newSelect);
+ },
});
/* XOSItemView
extend with:
app - MarionetteApplication
template - template (See XOSHelper.html)
- detailClass - class of detail view, probably an XOSDetailView
*/
XOSItemView = Marionette.ItemView.extend({
templateHelpers: function() { return { modelName: this.model.modelName,
collectionName: this.model.collectionName,
+ listFields: this.model.listFields,
addFields: this.model.addFields,
detailFields: this.model.detailFields,
foreignFields: this.model.foreignFields,
+ detailLinkFields: this.model.detailLinkFields,
inputType: this.model.inputType,
model: this.model,
}},
getAddChildHash: function() {
if (this.parentModel) {
- // Find the field name in the model that should point to
- // the parent object. For example, when adding a sliver, the
- // fieldName that should point to 'users' is 'creator'.
- parentFieldName = "unknown";
+ parentFieldName = this.parentModel.relatedCollections[this.collection.collectionName];
+ parentFieldName = parentFieldName || "unknown";
+
+ /*parentFieldName = "unknown";
+
for (fieldName in this.collection.foreignFields) {
cname = this.collection.foreignFields[fieldName];
if (cname = this.collection.collectionName) {
parentFieldName = fieldName;
}
- }
+ }*/
return "#addChild" + firstCharUpper(this.collection.modelName) + "/" + this.parentModel.modelName + "/" + parentFieldName + "/" + this.parentModel.id; // modelName, fieldName, id
} else {
return null;
templateHelpers: function() {
return { title: this.title,
- addChildHash: this.getAddChildHash() };
+ addChildHash: this.getAddChildHash(),
+ foreignFields: this.collection.foreignFields,
+ listFields: this.collection.listFields,
+ detailLinkFields: this.collection.detailLinkFields, };
},
});
+XOSDataTableView = Marionette.View.extend( {
+ el: '<div style="overflow: hidden">' +
+ '<h3 class="xos-list-title title_placeholder"></h3>' +
+ '<div class="header_placeholder"></div>' +
+ '<table></table>' +
+ '<div class="footer_placeholder"></div>' +
+ '</div>',
+
+ filter: undefined,
+
+ events: {"click button.btn-xos-add": "addClicked",
+ "click button.btn-xos-refresh": "refreshClicked",
+ },
+
+ _fetchStateChange: function() {
+ if (this.collection.fetching) {
+ $("#xos-list-title-spinner").show();
+ } else {
+ $("#xos-list-title-spinner").hide();
+ }
+ },
+
+ addClicked: function(e) {
+ e.preventDefault();
+ this.app.Router.navigate("add" + firstCharUpper(this.collection.modelName), {trigger: true});
+ },
+
+ refreshClicked: function(e) {
+ e.preventDefault();
+ this.collection.refresh(refreshRelated=true);
+ },
+
+
+ initialize: function() {
+ $(this.el).find(".footer_placeholder").html( xosListFooterTemplate({addChildHash: this.getAddChildHash()}) );
+ $(this.el).find(".header_placeholder").html( xosListHeaderTemplate() );
+
+ this.listenTo(this.collection, 'fetchStateChange', this._fetchStateChange);
+ },
+
+ render: function() {
+ var view = this;
+ var fieldDisplayNames = view.options.fieldDisplayNames || view.fieldDisplayNames || {};
+
+ view.columnsByIndex = [];
+ view.columnsByFieldName = {};
+ _.each(this.collection.listFields, function(fieldName) {
+ inputType = view.options.inputType || view.inputType || {};
+ mRender = undefined;
+ mSearchText = undefined;
+ sTitle = fieldName in fieldDisplayNames ? fieldDisplayNames[fieldName] : fieldNameToHumanReadable(fieldName);
+ bSortable = true;
+ if (fieldName=="backend_status") {
+ mRender = function(x,y,z) { return xosBackendStatusIconTemplate(z); };
+ sTitle = "";
+ bSortable = false;
+ } else if (fieldName in view.collection.foreignFields) {
+ var foreignCollection = view.collection.foreignFields[fieldName];
+ mSearchText = function(x) { return idToName(x, foreignCollection, "humanReadableName"); };
+ } else if (inputType[fieldName] == "spinner") {
+ mRender = function(x,y,z) { return xosDataTableSpinnerTemplate( {value: x, collectionName: view.collection.collectionName, fieldName: fieldName, id: z.id, app: view.app} ); };
+ }
+ if ($.inArray(fieldName, view.collection.detailLinkFields)>=0) {
+ var collectionName = view.collection.collectionName;
+ mRender = function(x,y,z) { return '<a href="#' + collectionName + '/' + z.id + '">' + x + '</a>'; };
+ }
+ thisColumn = {sTitle: sTitle, bSortable: bSortable, mData: fieldName, mRender: mRender, mSearchText: mSearchText};
+ view.columnsByIndex.push( thisColumn );
+ view.columnsByFieldName[fieldName] = thisColumn;
+ });
+
+ if (!view.noDeleteColumn) {
+ deleteColumn = {sTitle: "", bSortable: false, mRender: function(x,y,z) { return xosDeleteButtonTemplate({modelName: view.collection.modelName, id: z.id}); }, mData: function() { return "delete"; }};
+ view.columnsByIndex.push(deleteColumn);
+ view.columnsByFieldName["delete"] = deleteColumn;
+ };
+
+ oTable = $(this.el).find("table").dataTable( {
+ "bJQueryUI": true,
+ "bStateSave": true,
+ "bServerSide": true,
+ "bFilter": ! (view.options.disableFilter || view.disableFilter),
+ "bPaginate": ! (view.options.disablePaginate || view.disablePaginate),
+ "aoColumns": view.columnsByIndex,
+
+ fnServerData: function(sSource, aoData, fnCallback, settings) {
+ var compareColumns = function(sortCols, sortDirs, a, b) {
+ a = a[sortCols[0]];
+ b = b[sortCols[0]];
+ result = (a==b) ? 0 : ((a<b) ? -1 : 1);
+ if (sortDirs[0] == "desc") {
+ result = -result;
+ }
+ return result;
+ };
+
+ var searchMatch = function(row, sSearch) {
+ for (fieldName in row) {
+ if (fieldName in view.columnsByFieldName) {
+ try {
+ value = row[fieldName].toString();
+ } catch(e) {
+ continue;
+ }
+ if (value.indexOf(sSearch) >= 0) {
+ return true;
+ }
+ }
+ }
+ return false;
+ };
+
+ //console.log(aoData);
+\r
+ // function used to populate the DataTable with the current\r
+ // content of the collection\r
+ var populateTable = function()\r
+ {\r
+ //console.log("populatetable!");\r
+\r
+ // clear out old row views\r
+ rows = [];\r
+\r
+ sSearch = null;\r
+ iDisplayStart = 0;\r
+ iDisplayLength = 1000;\r
+ sortDirs = [];\r
+ sortCols = [];\r
+ _.each(aoData, function(param) {\r
+ if (param.name == "sSortDir_0") {\r
+ sortDirs = [param.value];\r
+ } else if (param.name == "iSortCol_0") {\r
+ sortCols = [view.columnsByIndex[param.value].mData];\r
+ } else if (param.name == "iDisplayStart") {\r
+ iDisplayStart = param.value;\r
+ } else if (param.name == "iDisplayLength") {\r
+ iDisplayLength = param.value;\r
+ } else if (param.name == "sSearch") {\r
+ sSearch = param.value;\r
+ }\r
+ });\r
+\r
+ aaData = view.collection.toJSON();\r
+\r
+ // apply backbone filtering on the models\r
+ if (view.filter) {\r
+ aaData = aaData.filter( function(row) { model = {}; model.attributes = row; return view.filter(model); } );\r
+ }\r
+\r
+ var totalSize = aaData.length;\r
+\r
+ // turn the ForeignKey fields into human readable things\r
+ for (rowIndex in aaData) {\r
+ row = aaData[rowIndex];\r
+ for (fieldName in row) {\r
+ if (fieldName in view.columnsByFieldName) {\r
+ mSearchText = view.columnsByFieldName[fieldName].mSearchText;\r
+ if (mSearchText) {\r
+ row[fieldName] = mSearchText(row[fieldName]);\r
+ }\r
+ }\r
+ }\r
+ }\r
+\r
+ // apply datatables search\r
+ if (sSearch) {\r
+ aaData = aaData.filter( function(row) { return searchMatch(row, sSearch); });\r
+ }\r
+\r
+ var filteredSize = aaData.length;\r
+\r
+ // apply datatables sort\r
+ aaData.sort(function(a,b) { return compareColumns(sortCols, sortDirs, a, b); });\r
+\r
+ // slice it for pagination\r
+ if (iDisplayLength >= 0) {\r
+ aaData = aaData.slice(iDisplayStart, iDisplayStart+iDisplayLength);\r
+ }\r
+\r
+ return fnCallback({iTotalRecords: totalSize,\r
+ iTotalDisplayRecords: filteredSize,\r
+ aaData: aaData});\r
+ };\r
+\r
+ aoData.shift(); // ignore sEcho
+ populateTable();
+
+ view.listenTo(view.collection, 'change', populateTable);
+ view.listenTo(view.collection, 'add', populateTable);
+ view.listenTo(view.collection, 'remove', populateTable);
+ },
+ } );
+
+ return this;
+ },
+
+ getAddChildHash: function() {
+ if (this.parentModel) {
+ parentFieldName = this.parentModel.relatedCollections[this.collection.collectionName];
+ parentFieldName = parentFieldName || "unknown";
+
+ /*parentFieldName = "unknown";
+
+ for (fieldName in this.collection.foreignFields) {
+ cname = this.collection.foreignFields[fieldName];
+ if (cname = this.collection.collectionName) {
+ parentFieldName = fieldName;
+ }
+ }*/
+ return "#addChild" + firstCharUpper(this.collection.modelName) + "/" + this.parentModel.modelName + "/" + parentFieldName + "/" + this.parentModel.id; // modelName, fieldName, id
+ } else {
+ return null;
+ }
+ },
+
+});
+
idToName = function(id, collectionName, fieldName) {
return xos.idToName(id, collectionName, fieldName);
};
+makeIdToName = function(collectionName, fieldName) {
+ return function(id) { return idToName(id, collectionName, fieldName); }
+};
+
/* Constructs lists of <option> html blocks for items in a collection.
selectedId = the id of an object that should be selected, if any
fieldName = name of field within models of collection that will be displayed
*/
-idToOptions = function(selectedId, collectionName, fieldName) {
+idToOptions = function(selectedId, collectionName, fieldName, filterFunc) {
result=""
for (index in xos[collectionName].models) {
linkedObject = xos[collectionName].models[index];
} else {
selected = "";
}
+ if ((filterFunc) && (!filterFunc(linkedObject))) {
+ continue;
+ }
result = result + '<option value="' + linkedId + '"' + selected + '>' + linkedName + '</option>';
}
return result;
fieldName = name of field within models of collection that will be displayed
*/
-idToSelect = function(variable, selectedId, collectionName, fieldName, readOnly) {
+idToSelect = function(variable, selectedId, collectionName, fieldName, readOnly, filterFunc) {
if (readOnly) {
readOnly = " readonly";
} else {
readOnly = "";
}
- result = '<select name="' + variable + '"' + readOnly + '>' +
- idToOptions(selectedId, collectionName, fieldName) +
+ result = '<select name="' + variable + '" id="field_' + variable + '"' + readOnly + '>' +
+ idToOptions(selectedId, collectionName, fieldName, filterFunc) +
'</select>';
- console.log(result);
return result;
}
+choicesToOptions = function(selectedValue, choices) {
+ result="";
+ for (index in choices) {
+ choice = choices[index];
+ displayName = choice[0];
+ value = choice[1];
+ if (value == selectedValue) {
+ selected = " selected";
+ } else {
+ selected = "";
+ }
+ result = result + '<option value="' + value + '"' + selected + '>' + displayName + '</option>';
+ }
+ return result;
+}
+
+choicesToSelect = function(variable, selectedValue, choices) {
+ result = '<select name="' + variable + '" id="field_' + variable + '">' +
+ choicesToOptions(selectedValue, choices) +
+ '</select>';
+ return result;
+}
git://git.onelab.eu / plstackapi.git / blobdiff