Fix error with revision check during saving.

diff --git a/src/redakcja/static/js/wiki/wikiapi.js b/src/redakcja/static/js/wiki/wikiapi.js
index 4a28d63..73642ac 100644 (file)
--- a/src/redakcja/static/js/wiki/wikiapi.js
+++ b/src/redakcja/static/js/wiki/wikiapi.js
@@ -126,6 +126,7 @@
             this.fullUri = $("*[data-key='full-uri']", meta).text();
 
            this.text = null;
             this.fullUri = $("*[data-key='full-uri']", meta).text();
 
            this.text = null;

+            this.saving = false;

            this.has_local_changes = false;
             this.active = new Date();
            this._lock = -1;
            this.has_local_changes = false;
             this.active = new Date();
            this._lock = -1;


@@ -217,6 +218,7 @@
             /* this doesn't modify anything, so no locks */
             var self = this;
             let active = new Date() - self.active < 30 * 1000;
             /* this doesn't modify anything, so no locks */
             var self = this;
             let active = new Date() - self.active < 30 * 1000;

+            let saving = self.saving;

             $.ajax({
                 method: "GET",
                 url: reverse("ajax_document_rev", self.id),
             $.ajax({
                 method: "GET",
                 url: reverse("ajax_document_rev", self.id),


@@ -247,7 +249,7 @@
                         });
                         $("#people").html(people);
 
                         });
                         $("#people").html(people);
 

-                        if (data.rev != self.revision) {
+                        if (!saving && (data.rev != self.revision)) {

                             params.outdated();
                         }
                    }
                             params.outdated();
                         }
                    }


@@ -375,6 +377,7 @@
 
            data['textsave-text'] = self.text;
 
 
            data['textsave-text'] = self.text;
 

+            self.saving = true;

            $.ajax({
                url: reverse("ajax_document_text", self.id),
                type: "POST",
            $.ajax({
                url: reverse("ajax_document_text", self.id),
                type: "POST",


@@ -392,10 +395,12 @@
                        changed = true;
                        self.triggerDocumentChanged();
                    };
                        changed = true;
                        self.triggerDocumentChanged();
                    };

+                    self.saving = false;

 
                    params['success'](self, changed, ((changed && "Udało się zapisać :)") || "Twoja wersja i serwera jest identyczna"));
                },
                error: function(xhr) {
 
                    params['success'](self, changed, ((changed && "Udało się zapisać :)") || "Twoja wersja i serwera jest identyczna"));
                },
                error: function(xhr) {

+                    self.saving = false;

                     if ($('#header').hasClass('saving')) {
                         $('#header').removeClass('saving');
                         $.blockUI({
                     if ($('#header').hasClass('saving')) {
                         $('#header').removeClass('saving');
                         $.blockUI({

diff --git a/src/team/models.py b/src/team/models.py
index 9bd4bf5..31f4435 100644 (file)
--- a/src/team/models.py
+++ b/src/team/models.py
@@ -17,7 +17,7 @@ class Profile(models.Model):
 
 
 class Presence(models.Model):
 
 
 class Presence(models.Model):

-    GAP_THRESHOLD = 60
+    GAP_THRESHOLD = 10

 
     user = models.ForeignKey(settings.AUTH_USER_MODEL, models.CASCADE, null=True, blank=True)
     session_key = models.CharField(max_length=255)
 
     user = models.ForeignKey(settings.AUTH_USER_MODEL, models.CASCADE, null=True, blank=True)
     session_key = models.CharField(max_length=255)