Permalink
Browse files

Merge branch 'develop' of https://github.com/txtr/django-cms into txt…

…r-develop
  • Loading branch information...
2 parents 3e0da6a + 737d7b0 commit 3ae09208e049ae471afc3baa566c227836947118 @chrisglass chrisglass committed Jun 7, 2012
View
@@ -1042,7 +1042,7 @@ def change_status(self, request, page_id):
Switch the status of a page
"""
if request.method != 'POST':
- return HttpResponseNotAllowed
+ return HttpResponseNotAllowed(['POST'])
page = get_object_or_404(Page, pk=page_id)
if page.has_publish_permission(request):
page.published = not page.published
@@ -1057,7 +1057,7 @@ def change_innavigation(self, request, page_id):
"""
# why require post and still have page id in the URL???
if request.method != 'POST':
- return HttpResponseNotAllowed
+ return HttpResponseNotAllowed(['POST'])
page = get_object_or_404(Page, pk=page_id)
if page.has_change_permission(request):
page.in_navigation = not page.in_navigation
@@ -1376,7 +1376,7 @@ def change_moderation(self, request, page_id):
"""
from cms.models.moderatormodels import MASK_PAGE, MASK_CHILDREN, MASK_DESCENDANTS
if request.method != 'POST':
- return HttpResponseNotAllowed
+ return HttpResponseNotAllowed(['POST'])
page = get_object_or_404(Page, id=page_id)
moderate = request.POST.get('moderate', None)
if moderate is not None and page.has_moderate_permission(request):
@@ -41,7 +41,7 @@
texteditor = get_editor("{{ name }}");
// First create db instance using AJAX post back
- add_plugin(pluginvalue, parent_id, language)
+ add_plugin(pluginvalue, parent_id, language);
}
});
{% for p in installed_plugins %}
@@ -84,11 +84,11 @@
tinymce.PluginManager.add('cmsplugins', tinymce.plugins.CMSPluginEditor);
function init_plugin_editor(placeholder){
- var toolbar = get_plugin_html()
- var html = '<table class="mceToolbar mceToolbarRow3 Enabled"><tbody>'
- html += '<td class="mceToolbarStart mceToolbarStartListBox mceFirst">'
- html += '<span></span>'
- html += '</td><td>' + toolbar + '</td></tbody></table>'
+ var toolbar = get_plugin_html();
+ var html = '<table class="mceToolbar mceToolbarRow3 Enabled"><tbody>';
+ html += '<td class="mceToolbarStart mceToolbarStartListBox mceFirst">';
+ html += '<span></span>';
+ html += '</td><td>' + toolbar + '</td></tbody></table>';
$("td.mceToolbar").append(html);
init_buttons(placeholder);
}
@@ -113,7 +113,7 @@
return;
}
// First create db instance using AJAX post back
- add_plugin(pluginvalue, parent_id, language)
+ add_plugin(pluginvalue, parent_id, language);
}).css("cursor", "pointer").css("margin", "5px");
@@ -92,7 +92,6 @@
var url = pathHolder.text();
// load just once
pathHolder.remove();
- var target = $(parent).find('div.load');
$(parent).find('div.loading').load(url);
}
return false;
@@ -42,9 +42,9 @@
});
$(document).ready(function(){
$("a.add-another,a.related-lookup").each(function(i, sign){
- var href = $(sign).attr("href")
+ var href = $(sign).attr("href");
if (href.substr(0,2) == ".."){
- href = "../../"+href
+ href = "../../"+href;
$(sign).attr("href", href);
}
});

0 comments on commit 3ae0920

Please sign in to comment.