[virtualcommons-svn] commit/vcweb: alllee: removing ChatMessage.message from json dict as it's already present in .value

[<com...@bi...>]

1 new commit in vcweb:

https://bitbucket.org/virtualcommons/vcweb/commits/c83b09da4b5a/
Changeset:   c83b09da4b5a
User:        alllee
Date:        2013-04-24 02:12:54
Summary:     removing ChatMessage.message from json dict as it's already present in .value
Affected #:  5 files

diff -r ada9963bcedf36160be60044fad4e846945b4869 -r c83b09da4b5ab40d5c6bd9ee2d45d19c9786a780 vcweb/bound/templates/bound/participate.html
--- a/vcweb/bound/templates/bound/participate.html
+++ b/vcweb/bound/templates/bound/participate.html
@@ -39,7 +39,7 @@
                 <div id='chat-div'><div class='chat-messages' data-bind='foreach: chatMessages'><i class='icon-user muted'></i><strong data-bind='text: participant_number'></strong>
-                        <small><i class='icon-double-angle-right'></i></small><span data-bind='text: message'></span>
+                        <small><i class='icon-double-angle-right'></i></small><span data-bind='text: value'></span><br></div></div>

diff -r ada9963bcedf36160be60044fad4e846945b4869 -r c83b09da4b5ab40d5c6bd9ee2d45d19c9786a780 vcweb/core/models.py
--- a/vcweb/core/models.py
+++ b/vcweb/core/models.py
@@ -2009,7 +2009,6 @@
         pgr = self.participant_group_relationship
         group = self.participant_group_relationship.group
         data.update(
-                message=self.message,
                 group_id=group.pk,
                 group=unicode(group),
                 participant_handle=pgr.participant_handle,

diff -r ada9963bcedf36160be60044fad4e846945b4869 -r c83b09da4b5ab40d5c6bd9ee2d45d19c9786a780 vcweb/core/templates/experimenter/monitor.html
--- a/vcweb/core/templates/experimenter/monitor.html
+++ b/vcweb/core/templates/experimenter/monitor.html
@@ -142,7 +142,7 @@
         <div id='experiment-chat-messages' class='scrollable-messages accordion-body collapse'><div class='alert' data-bind='foreach: chatMessages'><div>
-                    <span data-bind='text: participant_handle'></span>(<span data-bind='text: group'></span>): <strong data-bind='text: message'></strong>
+                    <span data-bind='text: participant_handle'></span>(<span data-bind='text: group'></span>): <strong data-bind='text: value'></strong><span class='pull-right' data-bind='text: short_date_created'></span></div></div>

diff -r ada9963bcedf36160be60044fad4e846945b4869 -r c83b09da4b5ab40d5c6bd9ee2d45d19c9786a780 vcweb/core/templates/forms/chat.html
--- a/vcweb/core/templates/forms/chat.html
+++ b/vcweb/core/templates/forms/chat.html
@@ -51,7 +51,7 @@
     }
     var chatMessagesViewModel = new ChatMessagesViewModel();
     {% for chat_message in chat_messages %}
-        chatMessagesViewModel.addMessage({ message: {{chat_message.message}}, date_created: {{chat_message.date_created}}, sender: {{chat_message.sender}} });
+        chatMessagesViewModel.addMessage({ message: {{chat_message.value}}, date_created: {{chat_message.date_created}}, sender: {{chat_message.sender}} });
     {% endfor %}
     ko.applyBindings(chatMessagesViewModel);
     var s = connect('/participant');

diff -r ada9963bcedf36160be60044fad4e846945b4869 -r c83b09da4b5ab40d5c6bd9ee2d45d19c9786a780 vcweb/lighterprints/templates/lighterprints/participate.html
--- a/vcweb/lighterprints/templates/lighterprints/participate.html
+++ b/vcweb/lighterprints/templates/lighterprints/participate.html
@@ -218,7 +218,7 @@
                             <div class='span6'><strong>Participant <span data-bind='text: participant_number'></span></strong><p>
-                                <span data-bind='text: message'></span>
+                                <span data-bind='text: value'></span></p></div><div class='span1'>

Repository URL: https://bitbucket.org/virtualcommons/vcweb/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.