Changeset 4884
- Timestamp:
- 06/15/11 19:39:54 (11 months ago)
- Location:
- trunk/merengueproj/plugins/core
- Files:
-
- 5 edited
- 1 moved
-
actions.py (modified) (1 diff)
-
config.py (modified) (2 diffs)
-
forms.py (modified) (3 diffs)
-
templates/core/hotlink.html (moved) (moved from trunk/merengueproj/plugins/core/templates/core/export_content.html) (1 diff)
-
urls.py (modified) (1 diff)
-
views.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/merengueproj/plugins/core/actions.py
r4882 r4884 73 73 74 74 75 class ExportContent(ContentTypeFilterProvider, ContentAction):76 name = ' export_content'77 verbose_name = _(' Export Content')75 class HotLinkAction(ContentTypeFilterProvider, ContentAction): 76 name = 'hotlink' 77 verbose_name = _('Link to your section') 78 78 79 79 def has_action(self, request, content): -
trunk/merengueproj/plugins/core/config.py
r4882 r4884 27 27 from merengue.section.models import Document 28 28 29 from plugins.core.actions import AdminAction, LoginAction, LogoutAction, PrintAction, ExportContent29 from plugins.core.actions import AdminAction, LoginAction, LogoutAction, PrintAction, HotLinkAction 30 30 from plugins.core.blocks import (CoreMenuBlock, NavigationBlock, 31 31 PortalMenuBlock, ContactInfoBlock, … … 51 51 52 52 def get_actions(self): 53 return [AdminAction, LoginAction, LogoutAction, PrintAction, ExportContent]53 return [AdminAction, LoginAction, LogoutAction, PrintAction, HotLinkAction] 54 54 55 55 def get_blocks(self): -
trunk/merengueproj/plugins/core/forms.py
r4882 r4884 9 9 10 10 11 class ExportContentForm(forms.ModelForm):11 class HotLinkForm(forms.ModelForm): 12 12 13 13 def __init__(self, user, content, data=None, *args, **kwargs): 14 super( ExportContentForm, self).__init__(data, *args, **kwargs)14 super(HotLinkForm, self).__init__(data, *args, **kwargs) 15 15 self.content = content 16 16 if user.is_superuser: … … 47 47 48 48 def clean(self): 49 cleaned_data = super( ExportContentForm, self).clean()49 cleaned_data = super(HotLinkForm, self).clean() 50 50 section = cleaned_data.get('section', None) 51 51 if section: … … 64 64 65 65 def save(self, commit=False): 66 menu = super( ExportContentForm, self).save(commit)66 menu = super(HotLinkForm, self).save(commit) 67 67 section = self.cleaned_data['section'].get_real_instance() 68 68 menu_parent = section.main_menu -
trunk/merengueproj/plugins/core/templates/core/hotlink.html
r4882 r4884 1 1 {% load i18n %} 2 2 3 <form method="POST" action="{% url export_contentcontent.pk %}">3 <form method="POST" action="{% url hotlink content.pk %}"> 4 4 {{ form.as_p }} 5 5 <div class="submit"> 6 <input type="submit" value="{% trans " Export Content" %}">6 <input type="submit" value="{% trans "Hot Link" %}"> 7 7 </div> 8 8 </form> -
trunk/merengueproj/plugins/core/urls.py
r4882 r4884 20 20 21 21 urlpatterns = patterns('plugins.core.views', 22 url(r'^ export_content/(?P<content_id>[\d-]+)/$', 'export_content', name='export_content'),22 url(r'^hotlink/(?P<content_id>[\d-]+)/$', 'hotlink', name='hotlink'), 23 23 ) -
trunk/merengueproj/plugins/core/views.py
r4882 r4884 3 3 4 4 from merengue.base.models import BaseContent 5 from plugins.core.forms import ExportContentForm5 from plugins.core.forms import HotLinkForm 6 6 7 7 8 def export_content(request, content_id):8 def hotlink(request, content_id): 9 9 content = BaseContent.objects.get(pk=content_id).get_real_instance() 10 10 data = None 11 11 if request.method == 'POST': 12 12 data = request.POST 13 form = ExportContentForm(request.user, content, data=data)13 form = HotLinkForm(request.user, content, data=data) 14 14 if form.is_valid(): 15 15 menu = form.save() 16 16 return HttpResponseRedirect(menu.url) 17 return HttpResponse(render_to_string('core/ export_content.html',17 return HttpResponse(render_to_string('core/hotlink.html', 18 18 {'form': form, 19 19 'content': content}), mimetype='text/html')
Note: See TracChangeset
for help on using the changeset viewer.
