Skip to content

Commit

Permalink
Fixes a bug with single quote strings in update page notice
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas von Deyen committed Nov 1, 2011
1 parent da87cee commit 962913a
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 9 deletions.
16 changes: 8 additions & 8 deletions app/controllers/admin/pages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ def configure
end
end

def update
# fetching page via before filter
if @page.update_attributes(params[:page])
@notice = _("Page %{name} saved") % {:name => @page.name}
else
render_remote_errors(@page, "form#edit_page_#{@page.id} button.button")
end
end
def update
# fetching page via before filter
if @page.update_attributes(params[:page])
@notice = _("Page %{name} saved") % {:name => @page.name}
else
render_remote_errors(@page, "form#edit_page_#{@page.id} button.button")
end
end

def destroy
# fetching page via before filter
Expand Down
16 changes: 15 additions & 1 deletion app/views/admin/pages/update.js.erb
Original file line number Diff line number Diff line change
@@ -1,19 +1,33 @@
(function($) {

Alchemy.closeCurrentWindow();

<%- if request.referer.include?('edit') -%>

Alchemy.reloadPreview();
$('#<%= dom_id(@page) -%>_status').replaceWith('<%= escape_javascript(render(:partial => "page_status")) -%>');

<%- else -%>

$('#<%= dom_id(@page) -%> > .sitemap_page > .sitemap_sitename .sitemap_pagename_link').text('<%= @page.name -%>');

<%- if @page.locked? && @page.locker == current_user -%>
$('#locked_page_<%= @page.id -%> > a').text('<%= @page.name -%>');
<%- end -%>

$('#page_<%= @page.id -%>_infos').html('<%= escape_javascript(render(:partial => "page_infos", :locals => {:page => @page})) -%>');

<%- if @page.restricted? -%>

$('#<%= dom_id(@page) -%> .page_status:nth-child(3)').addClass('restricted', 'not_restricted').removeClass('not_restricted');

<%- else -%>

$('#<%= dom_id(@page) -%> .page_status:nth-child(3)').addClass('not_restricted').removeClass('restricted');
<%- end -%>

<%- end -%>
Alchemy.growl('<%= @notice -%>');

Alchemy.growl("<%= @notice -%>");

})(jQuery);

0 comments on commit 962913a

Please sign in to comment.