bunch of stuff

This commit is contained in:
Edin Dazdarevic
2015-05-28 17:06:59 +02:00
parent 9641f4fee7
commit 701f0844a6
7 changed files with 157 additions and 66 deletions

View File

@@ -22,18 +22,31 @@ Router.route('/machine/:machineId/config/:configId', function() {
this.render('configPage', {
data: function() {
var config = Machines.find({
"machineId": this.params.machineId,
"configurations._id": this.params.configId
}, {
'configurations.$': 1
});
// var config = Machines.findOne({
// // "machineId": this.params.machineId,
// "configurations._id": this.params.configId
// }, {
// 'configurations.$': 1
// });
var machine = Machines.findOne({machineId: this.params.machineId});
return {
machine: machine,
config: config
};
var machine = Machines.findOne({
machineId: this.params.machineId
});
if (machine) {
var config;
for (var i = 0; i < machine.configurations.length; i++) {
if (machine.configurations[i]._id === this.params.configId) {
config = machine.configurations[i];
break;
}
}
return {
machine: machine,
config: config
};
}
// return config;
}
});

View File

@@ -4,15 +4,26 @@
<h1>confighub.io</h1>
<div class='col-lg-12'>
<h2>
Configuration page for {{ machine.machineId}} {{ config.type }} {{ config.description }}
Configuration for {{ config.type }}
</h2>
</div>
</div>
<div class="row">
<div class="col-lg-12">
{{> CodeMirror id="config-content" name="config-content" options=editorOptions code=editorCode reactiveVar="varName"}}
Description <input type="text" value={{config.description}}>
</div>
<div class="col-lg-12">
File path <input type="text" value={{config.filePath}}>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<!-- {{config.content}} -->
{{> CodeMirror id="config-content" name="config-content" options=editorOptions code=editorCode }}
</div>
</div>
<div class="row">

View File

@@ -1,5 +1,38 @@
Template.configPage.events({
"click .save-config-details-btn": function(event, template) {
console.log('should save config!!!');
var content = template.find('#config-content').value;
// Machines.update({});
var config = Template.instance().data.config;
// var machine = Machines.findOne({ machineId: Template.instance().data.machine.machineId });
// if (machine) {
// for(var i = 0; i < machine.configurations.length; i++) {
// if(machine.configurations[i]._id === config._id) {
// machine.configurations[i].content = content;
// // Machines.save(machine);
// break;
// }
// }
// }
// Machines.update({
// "configurations._id": Template.instance().data.config._id,
// "machineId": Template.instance().data.machine.machineId
// }, {
// content: content
// });
}
})
});
// Session.set('config.content', Template.configPage.);
Template.configPage.helpers({
"editorOptions": function() {
return {
lineNumbers: true,
mode: "javascript"
}
},
"editorCode": function(a,template) {
return Template.instance().data.config.content;
}
});

View File

@@ -9,25 +9,31 @@ Template.newConfigurationDialog.events({
var configDescription = template.find('.configuration-description').value;
var configType = template.find('.config-type').value;
if (machine) {
Machines.update({
_id: machine._id
}, {
$push: {
configurations: {
machineId: machine.machineId,
_id: (new Mongo.ObjectID()).toHexString(),
description: configDescription,
type: configType
HTTP.call("GET", "/configs/" + configType + '.conf', function(error, result) {
console.log(result);
if (machine) {
Machines.update({
_id: machine._id
}, {
$push: {
configurations: {
machineId: machine.machineId,
_id: (new Mongo.ObjectID()).toHexString(),
description: configDescription,
type: configType,
content: result.content,
filePath: ''
}
}
}
});
});
}
});
// db.students.update(
// { _id: 1 },
// { $push: { scores: 89 } }
// )
// db.students.update(
// { _id: 1 },
// { $push: { scores: 89 } }
// )
}
Session.set('newConfigurationRequested', false);
},
"click .cancel-save-config-btn": function(event, template) {