[dss-commits] digitalSTROM Server branch, master, updated. c4ff032f2aec22dac64f008110bf189f74f2fe68
git version control
dss-commits at forum.digitalstrom.org
Wed Dec 16 15:12:52 CET 2009
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM Server".
The branch, master has been updated
via c4ff032f2aec22dac64f008110bf189f74f2fe68 (commit)
via e04e01637791aabc4b113424661bf28a35777463 (commit)
via 2d23851f1d675a22fde8ef6a52d2c96c453f45a0 (commit)
from dd649f1d4972da3d49d7add8b3ab3147bb8c74eb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c4ff032f2aec22dac64f008110bf189f74f2fe68
Author: Matias E. Fernandez <âmfernandez at futurelab.châ>
Date: Wed Dec 16 11:04:25 2009 +0100
Updated websrc submodule to newest version
commit e04e01637791aabc4b113424661bf28a35777463
Author: Matias E. Fernandez <âmfernandez at futurelab.châ>
Date: Wed Dec 16 11:00:45 2009 +0100
Ignoring setup interface JavaScript
* added data/webroot/js/dss-setup-interface.js to .gitignore
commit 2d23851f1d675a22fde8ef6a52d2c96c453f45a0
Author: Matias E. Fernandez <âmfernandez at futurelab.châ>
Date: Wed Dec 16 10:02:08 2009 +0100
Refetching of Apartment Data
* fixed a bug found by Moritz Halter where apartment data was not updated correctly after refetching
-----------------------------------------------------------------------
Changes:
diff --git a/.gitignore b/.gitignore
index 170fc55..1c0415d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ build/
doc/json_api.xml
data/webroot/js/lib/
Debug/
+data/webroot/js/dss-setup-interface.js
diff --git a/data/webroot/js/model.js b/data/webroot/js/model.js
index ed366c6..7bfa78b 100644
--- a/data/webroot/js/model.js
+++ b/data/webroot/js/model.js
@@ -78,6 +78,7 @@ var Apartment = Class.create({
fetch: function() {
var self = this;
var structure = self.sendSyncRequest("getStructure", {});
+ self.zones = [];
structure.apartment.zones.each(function(zone) {
var zoneObj = new Zone(zone.id, zone.name);
self.zones.push(zoneObj);
diff --git a/websrc b/websrc
index dfc966c..0de2f6e 160000
--- a/websrc
+++ b/websrc
@@ -1 +1 @@
-Subproject commit dfc966cc92643f3c2c05f9f79d1c85519291f9df
+Subproject commit 0de2f6e09d4f9fc182f9bc3e1f02255f92c1a883
hooks/post-receive
--
digitalSTROM Server
More information about the dss-commits
mailing list