Changeset 4884


Ignore:
Timestamp:
06/15/11 19:39:54 (11 months ago)
Author:
pmartin
Message:

See #1 #2032 Change the name of the action

Location:
trunk/merengueproj/plugins/core
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/merengueproj/plugins/core/actions.py

    r4882 r4884  
    7373 
    7474 
    75 class ExportContent(ContentTypeFilterProvider, ContentAction): 
    76     name = 'export_content' 
    77     verbose_name = _('Export Content') 
     75class HotLinkAction(ContentTypeFilterProvider, ContentAction): 
     76    name = 'hotlink' 
     77    verbose_name = _('Link to your section') 
    7878 
    7979    def has_action(self, request, content): 
  • trunk/merengueproj/plugins/core/config.py

    r4882 r4884  
    2727from merengue.section.models import Document 
    2828 
    29 from plugins.core.actions import AdminAction, LoginAction, LogoutAction, PrintAction, ExportContent 
     29from plugins.core.actions import AdminAction, LoginAction, LogoutAction, PrintAction, HotLinkAction 
    3030from plugins.core.blocks import (CoreMenuBlock, NavigationBlock, 
    3131                                 PortalMenuBlock, ContactInfoBlock, 
     
    5151 
    5252    def get_actions(self): 
    53         return [AdminAction, LoginAction, LogoutAction, PrintAction, ExportContent] 
     53        return [AdminAction, LoginAction, LogoutAction, PrintAction, HotLinkAction] 
    5454 
    5555    def get_blocks(self): 
  • trunk/merengueproj/plugins/core/forms.py

    r4882 r4884  
    99 
    1010 
    11 class ExportContentForm(forms.ModelForm): 
     11class HotLinkForm(forms.ModelForm): 
    1212 
    1313    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) 
    1515        self.content = content 
    1616        if user.is_superuser: 
     
    4747 
    4848    def clean(self): 
    49         cleaned_data = super(ExportContentForm, self).clean() 
     49        cleaned_data = super(HotLinkForm, self).clean() 
    5050        section = cleaned_data.get('section', None) 
    5151        if section: 
     
    6464 
    6565    def save(self, commit=False): 
    66         menu = super(ExportContentForm, self).save(commit) 
     66        menu = super(HotLinkForm, self).save(commit) 
    6767        section = self.cleaned_data['section'].get_real_instance() 
    6868        menu_parent = section.main_menu 
  • trunk/merengueproj/plugins/core/templates/core/hotlink.html

    r4882 r4884  
    11{% load i18n %} 
    22 
    3 <form method="POST" action="{% url export_content content.pk %}"> 
     3<form method="POST" action="{% url hotlink content.pk %}"> 
    44    {{ form.as_p }} 
    55    <div class="submit"> 
    6       <input type="submit" value="{% trans "Export Content" %}"> 
     6      <input type="submit" value="{% trans "Hot Link" %}"> 
    77    </div> 
    88</form> 
  • trunk/merengueproj/plugins/core/urls.py

    r4882 r4884  
    2020 
    2121urlpatterns = 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'), 
    2323) 
  • trunk/merengueproj/plugins/core/views.py

    r4882 r4884  
    33 
    44from merengue.base.models import BaseContent 
    5 from plugins.core.forms import ExportContentForm 
     5from plugins.core.forms import HotLinkForm 
    66 
    77 
    8 def export_content(request, content_id): 
     8def hotlink(request, content_id): 
    99    content = BaseContent.objects.get(pk=content_id).get_real_instance() 
    1010    data = None 
    1111    if request.method == 'POST': 
    1212        data = request.POST 
    13     form = ExportContentForm(request.user, content, data=data) 
     13    form = HotLinkForm(request.user, content, data=data) 
    1414    if form.is_valid(): 
    1515        menu = form.save() 
    1616        return HttpResponseRedirect(menu.url) 
    17     return HttpResponse(render_to_string('core/export_content.html', 
     17    return HttpResponse(render_to_string('core/hotlink.html', 
    1818                        {'form': form, 
    1919                         'content': content}), mimetype='text/html') 
Note: See TracChangeset for help on using the changeset viewer.