publish log + some fixes

[redakcja.git] / redakcja / static / js / wiki / wikiapi.js

diff --git a/redakcja/static/js/wiki/wikiapi.js b/redakcja/static/js/wiki/wikiapi.js
index bce1f89..3907e8e 100644 (file)
--- a/redakcja/static/js/wiki/wikiapi.js
+++ b/redakcja/static/js/wiki/wikiapi.js
@@ -15,38 +15,40 @@
         */
        function reverse() {
                var vname = arguments[0];
         */
        function reverse() {
                var vname = arguments[0];

-               var base_path = "/documents";
+               var base_path = "/editor";

 
                if (vname == "ajax_document_text") {
 
                if (vname == "ajax_document_text") {

-                       var path = "/" + arguments[1] + "/text";
+                       var path = "/text/" + arguments[1] + '/';

 
                if (arguments[2] !== undefined)
 
                if (arguments[2] !== undefined)

-                               path += "/" + arguments[2];
+                               path += arguments[2] + '/';

 
                        return base_path + path;
                }
 
 
                        return base_path + path;
                }
 

+        if (vname == "ajax_document_revert") {
+            return base_path + "/revert/" + arguments[1] + '/';
+        }
+
+

                if (vname == "ajax_document_history") {
 
                if (vname == "ajax_document_history") {
 

-                       return base_path + "/" + arguments[1] + "/history";
+                       return base_path + "/history/" + arguments[1] + '/';

                }
 
                if (vname == "ajax_document_gallery") {
 
                }
 
                if (vname == "ajax_document_gallery") {
 

-                       return base_path + "/" + arguments[1] + "/gallery";
+                       return base_path + "/gallery/" + arguments[1] + '/';

                }
 
                if (vname == "ajax_document_diff")
                }
 
                if (vname == "ajax_document_diff")

-                       return base_path + "/" + arguments[1] + "/diff";
+                       return base_path + "/diff/" + arguments[1] + '/';

 
         if (vname == "ajax_document_rev")
 
         if (vname == "ajax_document_rev")

-            return base_path + "/" + arguments[1] + "/rev";
-
-               if (vname == "ajax_document_addtag")
-                       return base_path + "/" + arguments[1] + "/tags";
+            return base_path + "/rev/" + arguments[1] + '/';

 
 

-               if (vname == "ajax_publish")
-                       return base_path + "/" + arguments[1] + "/publish";
+               if (vname == "ajax_document_pubmark")
+                       return base_path + "/pubmark/" + arguments[1] + '/';

 
                console.log("Couldn't reverse match:", vname);
                return "/404.html";
 
                console.log("Couldn't reverse match:", vname);
                return "/404.html";


@@ -57,12 +59,23 @@
         */
        function WikiDocument(element_id) {
                var meta = $('#' + element_id);
         */
        function WikiDocument(element_id) {
                var meta = $('#' + element_id);

-               this.id = meta.attr('data-document-name');
+               this.id = meta.attr('data-book') + '/' + meta.attr('data-chunk');

 
                this.revision = $("*[data-key='revision']", meta).text();
                this.readonly = !!$("*[data-key='readonly']", meta).text();
 
                this.galleryLink = $("*[data-key='gallery']", meta).text();
 
                this.revision = $("*[data-key='revision']", meta).text();
                this.readonly = !!$("*[data-key='readonly']", meta).text();
 
                this.galleryLink = $("*[data-key='gallery']", meta).text();

+
+        var diff = $("*[data-key='diff']", meta).text();
+        diff = diff.split(',');
+        if (diff.length == 2 && diff[0] < diff[1])
+            this.diff = diff;
+        else if (diff.length == 1) {
+            diff = parseInt(diff);
+            if (diff != NaN)
+                this.diff = [diff - 1, diff];
+        }
+

                this.galleryImages = [];
                this.text = null;
                this.has_local_changes = false;
                this.galleryImages = [];
                this.text = null;
                this.has_local_changes = false;


@@ -163,8 +176,12 @@
             url: reverse("ajax_document_rev", self.id),
             dataType: 'text',
             success: function(data) {
             url: reverse("ajax_document_rev", self.id),
             dataType: 'text',
             success: function(data) {

-                if (data != self.revision)
-                    params.error();
+                if (data == '') {
+                    if (params.error)
+                        params.error();
+                }
+                else if (data != self.revision)
+                    params.outdated();

             }
         });
     };
             }
         });
     };


@@ -225,11 +242,7 @@
                        data[this.name] = this.value;
                });
 
                        data[this.name] = this.value;
                });
 

-               var metaComment = '<!--';
-               metaComment += '\n\tgallery:' + self.galleryLink;
-               metaComment += '\n-->\n'
-
-               data['textsave-text'] = metaComment + self.text;
+               data['textsave-text'] = self.text;

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


@@ -279,6 +292,45 @@
         });
        }; /* end of save() */
 
         });
        }; /* end of save() */
 

+    WikiDocument.prototype.revertToVersion = function(params) {
+        var self = this;
+        params = $.extend({}, noops, params);
+
+        if (params.revision >= this.revision) {
+            params.failure(self, 'Proszę wybrać rewizję starszą niż aktualna.');
+            return;
+        }
+
+        // Serialize form to dictionary
+        var data = {};
+        $.each(params['form'].serializeArray(), function() {
+            data[this.name] = this.value;
+        });
+
+        $.ajax({
+            url: reverse("ajax_document_revert", self.id),
+            type: "POST",
+            dataType: "json",
+            data: data,
+            success: function(data) {
+                if (data.text) {
+                    self.text = data.text;
+                    self.revision = data.revision;
+                    self.gallery = data.gallery;
+                    self.triggerDocumentChanged();
+
+                    params.success(self, "Udało się przywrócić wersję :)");
+                }
+                else {
+                    params.failure(self, "Przywracana wersja identyczna z aktualną. Anulowano przywracanie.");
+                }
+            },
+            error: function(xhr) {
+                params.failure(self, "Nie udało się przywrócić wersji - błąd serwera.");
+            }
+        });
+    };
+

        WikiDocument.prototype.publish = function(params) {
                params = $.extend({}, noops, params);
                var self = this;
        WikiDocument.prototype.publish = function(params) {
                params = $.extend({}, noops, params);
                var self = this;


@@ -305,11 +357,12 @@
                        }
                });
        };
                        }
                });
        };

-       WikiDocument.prototype.setTag = function(params) {
+
+       WikiDocument.prototype.pubmark = function(params) {

                params = $.extend({}, noops, params);
                var self = this;
                var data = {
                params = $.extend({}, noops, params);
                var self = this;
                var data = {

-                       "addtag-id": self.id,
+                       "pubmark-id": self.id,

                };
 
                /* unpack form */
                };
 
                /* unpack form */


@@ -318,7 +371,7 @@
                });
 
                $.ajax({
                });
 
                $.ajax({

-                       url: reverse("ajax_document_addtag", self.id),
+                       url: reverse("ajax_document_pubmark", self.id),

                        type: "POST",
                        dataType: "json",
                        data: data,
                        type: "POST",
                        dataType: "json",
                        data: data,