[virtualcommons-svn] commit/vcweb: 2 new changesets

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

2 new changesets in vcweb:

http://bitbucket.org/virtualcommons/vcweb/changeset/54c7b116e4e9/
changeset:   54c7b116e4e9
user:        alllee
date:        2011-06-22 10:39:05
summary:     minor ui changes, increasing setTimeout in submit, still has some issues w/
validation
affected #:  3 files (59 bytes)

--- a/vcweb/core/templates/experimenter/monitor.html	Wed Jun 22 00:57:02 2011 -0700
+++ b/vcweb/core/templates/experimenter/monitor.html	Wed Jun 22 01:39:05 2011 -0700
@@ -104,7 +104,7 @@
 {% endblock %}
 {% block page %}
 {{block.super}}
-<h3>{{experiment.status_line}}</h3>
+<h3>{{experiment}}</h3><span>You are logged in as {{request.user.experimenter}}.</span><hr/><div id='experimenter-sidebar'>


--- a/vcweb/core/templates/includes/participant.events.html	Wed Jun 22 00:57:02 2011 -0700
+++ b/vcweb/core/templates/includes/participant.events.html	Wed Jun 22 01:39:05 2011 -0700
@@ -13,7 +13,8 @@
       "message_type": event_type,
 {% if participant_group_relationship %}
       "participant_group_relationship_id": {{participant_group_relationship.pk}},
-{% else %}
+{% endif %}
+{% if participant_experiment_relationship %}
       "participant_experiment_relationship_id": {{participant_experiment_relationship.pk}},
 {% endif %}
       "message": payload


--- a/vcweb/forestry/templates/forestry/participate.html	Wed Jun 22 00:57:02 2011 -0700
+++ b/vcweb/forestry/templates/forestry/participate.html	Wed Jun 22 01:39:05 2011 -0700
@@ -49,8 +49,8 @@
             s.send(createSubmitEvent(harvestDecisionValue));
             setTimeout(function() {
                 $('#forestry-form').submit();
-                }, 300);
-            return true;
+                }, 800);
+            return false;
         });
     });
 </script>


http://bitbucket.org/virtualcommons/vcweb/changeset/e22e9c057372/
changeset:   e22e9c057372
user:        alllee
date:        2011-06-22 10:50:58
summary:     only sending the submit event if there's something to send,

TODO: work out proper integration with jquery validate, it shouldn't send it out if
it fails validation.
affected #:  1 file (16 bytes)

--- a/vcweb/forestry/templates/forestry/participate.html	Wed Jun 22 01:39:05 2011 -0700
+++ b/vcweb/forestry/templates/forestry/participate.html	Wed Jun 22 01:50:58 2011 -0700
@@ -37,16 +37,18 @@
             var harvestDecisionValue = $('#harvest-decision-id').val();
             // FIXME: this isn't getting sent through properly before the submit occurs.  
             // Should work out communicating directly from Django to the tornadio process.
-            $('#submit').attr('disabled', true);
-            s.send(createSubmitEvent(harvestDecisionValue));
-            $('#forestry-form').delay(500).submit();
-            return false;
+            // $('#submit-harvest').attr('disabled', true);
+            if (harvestDecisionValue) {
+                s.send(createSubmitEvent(harvestDecisionValue));
+            }
+            return true;
         });
         */
         $('#submit-harvest').click(function() {
             var harvestDecisionValue = $('#harvest-decision-id').val();
-            $('#submit-harvest').attr('disabled', true);
-            s.send(createSubmitEvent(harvestDecisionValue));
+            if (harvestDecisionValue) {
+                s.send(createSubmitEvent(harvestDecisionValue));
+            }
             setTimeout(function() {
                 $('#forestry-form').submit();
                 }, 800);

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.