X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/573b9004c7bc2a6a2b29335155b4ff55d142c6b6..fbb8f42993d02108b506028dc85466a0541be359:/src/redakcja/static/js/wiki/base.js diff --git a/src/redakcja/static/js/wiki/base.js b/src/redakcja/static/js/wiki/base.js index 4d3a062f..ad0ca835 100644 --- a/src/redakcja/static/js/wiki/base.js +++ b/src/redakcja/static/js/wiki/base.js @@ -103,7 +103,7 @@ $.wiki.exitTab = function(tab){ var self = this; var $tab = $(tab); - if (!('.active', $tab)) return; + if (!('.active', $tab).length) return; $('.active', $tab).removeClass('active'); self.perspectives[$tab.attr('id')].onExit(); $('#' + $tab.attr('data-ui-related')).hide(); @@ -196,8 +196,7 @@ $elem.removeClass('row-stub'); params.container.append($elem); - $('*[data-stub-value]', $elem).each(function() { - var $this = $(this); + var populate = function($this) { var field = $this.attr('data-stub-value'); var value = params.data[field]; @@ -215,7 +214,9 @@ $this.removeAttr('data-stub-target'); $this.removeAttr('data-stub-value'); } - }); + } + if ($elem.attr('data-stub-value')) populate($elem); + $('*[data-stub-value]', $elem).each(function() {populate($(this))}); $elem.show(); return $elem; @@ -307,7 +308,7 @@ var span = $("*[data-ui-error-for='"+field_name+"']", this.$elem); if(!span.length) { - unassigned.push(field_name); + unassigned.push(errors[field_name]); continue; } @@ -315,7 +316,8 @@ } if(unassigned.length > 0) - global.text( global.text() + 'W formularzu wystąpiły błędy'); + global.text( + global.text() + 'Wystąpił błąd: ' + unassigned.join(', ')); } } @@ -344,6 +346,7 @@ $.ajax("/editor/editor-user-area/", { success: function(d) { $("#user-area")[0].innerHTML = d; + $('#history-view-editor').toggleClass('can-approve', $('#user-area #pubmark_dialog').length > 0); } }); }, false);