ACP is alive! #93, #156

misago/apps/admin/bans/views.py

@@ -74,10 +74,10 @@ class New(FormWidget):
     form = BanForm
     submit_button = _("Set Ban")
 
-    def get_new_url(self, model):
+    def get_new_link(self, model):
         return reverse('admin_bans_new')
 
-    def get_edit_url(self, model):
+    def get_edit_link(self, model):
         return reverse('admin_bans_edit', model)
 
     def submit_form(self, form, target):
@@ -107,11 +107,11 @@ class Edit(FormWidget):
     notfound_message = _('Requested Ban could not be found.')
     submit_fallback = True
 
-    def get_url(self, model):
+    def get_link(self, model):
         return reverse('admin_bans_edit', model)
 
-    def get_edit_url(self, model):
-        return self.get_url(model)
+    def get_edit_link(self, model):
+        return self.get_link(model)
 
     def get_initial_data(self, model):
         return {

misago/apps/admin/forumroles/views.py

@@ -54,10 +54,10 @@ class New(FormWidget):
     form = ForumRoleForm
     submit_button = _("Save Role")
 
-    def get_new_url(self, model):
+    def get_new_link(self, model):
         return reverse('admin_roles_forums_new')
 
-    def get_edit_url(self, model):
+    def get_edit_link(self, model):
         return reverse('admin_roles_forums_edit', model)
 
     def submit_form(self, form, target):
@@ -78,11 +78,11 @@ class Edit(FormWidget):
     notfound_message = _('Requested Forum Role could not be found.')
     submit_fallback = True
 
-    def get_url(self, model):
+    def get_link(self, model):
         return reverse('admin_roles_forums_edit', model)
 
-    def get_edit_url(self, model):
-        return self.get_url(model)
+    def get_edit_link(self, model):
+        return self.get_link(model)
 
     def get_initial_data(self, model):
         return {
@@ -109,11 +109,11 @@ class ACL(FormWidget):
         self.form = build_forum_form(self.request, target)
         return self.form
 
-    def get_url(self, model):
+    def get_link(self, model):
         return reverse('admin_roles_forums_acl', model)
 
-    def get_edit_url(self, model):
-        return self.get_url(model)
+    def get_edit_link(self, model):
+        return self.get_link(model)
 
     def get_initial_data(self, model):
         raw_acl = model.permissions

misago/apps/admin/forums/views.py

@@ -116,7 +116,7 @@ def resync_forums(request, forum=0, progress=0):
                                    'target_name': forum.name,
                                    'message': _('Resynchronized %(progress)s from %(total)s threads') % {'progress': progress, 'total': threads_total},
                                    'progress': progress * 100 / threads_total,
-                                   'cancel_url': reverse('admin_forums'),
+                                   'cancel_link': reverse('admin_forums'),
                                    },
                                   context_instance=RequestContext(request));
 
@@ -137,10 +137,10 @@ class NewNode(FormWidget):
     form = NewNodeForm
     submit_button = _("Save Node")
 
-    def get_new_url(self, model):
+    def get_new_link(self, model):
         return reverse('admin_forums_new')
 
-    def get_edit_url(self, model):
+    def get_edit_link(self, model):
         return reverse('admin_forums_edit', model)
 
     def get_initial_data(self, model):
@@ -245,11 +245,11 @@ class Edit(FormWidget):
     notfound_message = _('Requested Forum could not be found.')
     submit_fallback = True
 
-    def get_url(self, model):
+    def get_link(self, model):
         return reverse('admin_forums_edit', model)
 
-    def get_edit_url(self, model):
-        return self.get_url(model)
+    def get_edit_link(self, model):
+        return self.get_link(model)
 
     def get_form(self, target):
         if target.type == 'category':
@@ -337,7 +337,7 @@ class Delete(FormWidget):
     notfound_message = _('Requested Forum could not be found.')
     submit_fallback = True
 
-    def get_url(self, model):
+    def get_link(self, model):
         return reverse('admin_forums_delete', model)
 
     def get_form(self, target):

misago/apps/admin/newsletters/views.py

@@ -68,10 +68,10 @@ class New(FormWidget):
     submit_button = _("Save Newsletter")
     tabbed = True
 
-    def get_new_url(self, model):
+    def get_new_link(self, model):
         return reverse('admin_newsletters_new')
 
-    def get_edit_url(self, model):
+    def get_edit_link(self, model):
         return reverse('admin_newsletters_edit', model)
 
     def submit_form(self, form, target):
@@ -102,11 +102,11 @@ class Edit(FormWidget):
     submit_fallback = True
     tabbed = True
 
-    def get_url(self, model):
+    def get_link(self, model):
         return reverse('admin_newsletters_edit', model)
 
-    def get_edit_url(self, model):
-        return self.get_url(model)
+    def get_edit_link(self, model):
+        return self.get_link(model)
 
     def get_initial_data(self, model):
         return {
@@ -165,8 +165,8 @@ def send(request, target, token):
             tokens = {
               '{{ board_name }}': settings.board_name,
               '{{ username }}': user.username,
-              '{{ user_url }}': django_reverse('user', kwargs={'username': user.username_slug, 'user': user.pk}),
-              '{{ board_url }}': settings.BOARD_ADDRESS,
+              '{{ user_link }}': django_reverse('user', kwargs={'username': user.username_slug, 'user': user.pk}),
+              '{{ board_link }}': settings.BOARD_ADDRESS,
             }
             subject = newsletter.parse_name(tokens)
             user.email_user(request, 'users/newsletter', subject, {
@@ -192,7 +192,7 @@ def send(request, target, token):
                                       'target_name': newsletter.name,
                                       'message': _('Sent to %(progress)s from %(total)s users') % {'progress': newsletter.progress, 'total': recipients_total},
                                       'progress': newsletter.progress * 100 / recipients_total,
-                                      'cancel_url': reverse('admin_newsletters'),
+                                      'cancel_link': reverse('admin_newsletters'),
                                       },
                                       context_instance=RequestContext(request));
         response['refresh'] = '2;url=%s' % reverse('admin_newsletters_send', newsletter)

misago/apps/admin/pruneusers/views.py

@@ -53,10 +53,10 @@ class New(FormWidget):
     form = PolicyForm
     submit_button = _("Save Policy")
 
-    def get_new_url(self, model):
+    def get_new_link(self, model):
         return reverse('admin_prune_users_new')
 
-    def get_edit_url(self, model):
+    def get_edit_link(self, model):
         return reverse('admin_prune_users_edit', model)
 
     def submit_form(self, form, target):
@@ -90,11 +90,11 @@ class Edit(FormWidget):
     notfound_message = _('Requested pruning policy could not be found.')
     submit_fallback = True
 
-    def get_url(self, model):
+    def get_link(self, model):
         return reverse('admin_prune_users_edit', model)
 
-    def get_edit_url(self, model):
-        return self.get_url(model)
+    def get_edit_link(self, model):
+        return self.get_link(model)
 
     def get_initial_data(self, model):
         return {
@@ -149,7 +149,7 @@ class Apply(FormWidget):
     submit_fallback = True
     template = 'apply'
 
-    def get_url(self, model):
+    def get_link(self, model):
         return reverse('admin_prune_users_apply', model)
 
     def __call__(self, request, target=None, slug=None):
@@ -161,7 +161,7 @@ class Apply(FormWidget):
             model = self.get_and_validate_target(target)
             self.original_name = self.get_target_name(model)
             if not model:
-                return redirect(self.get_fallback_url())
+                return redirect(self.get_fallback_link())
         original_model = model
 
         # Set filter
@@ -201,8 +201,8 @@ class Apply(FormWidget):
                                   'admin': self.admin,
                                   'action': self,
                                   'request': request,
-                                  'url': self.get_url(model),
-                                  'fallback': self.get_fallback_url(),
+                                  'url': self.get_link(model),
+                                  'fallback': self.get_fallback_link(),
                                   'messages': request.messages.get_messages(self.admin.id),
                                   'message': message,
                                   'tabbed': self.tabbed,

misago/apps/admin/ranks/views.py

@@ -73,10 +73,10 @@ class New(FormWidget):
     form = RankForm
     submit_button = _("Save Rank")
 
-    def get_new_url(self, model):
+    def get_new_link(self, model):
         return reverse('admin_ranks_new')
 
-    def get_edit_url(self, model):
+    def get_edit_link(self, model):
         return reverse('admin_ranks_edit', model)
 
     def submit_form(self, form, target):
@@ -111,11 +111,11 @@ class Edit(FormWidget):
     translate_target_name = True
     submit_fallback = True
 
-    def get_url(self, model):
+    def get_link(self, model):
         return reverse('admin_ranks_edit', model)
 
-    def get_edit_url(self, model):
-        return self.get_url(model)
+    def get_edit_link(self, model):
+        return self.get_link(model)
 
     def get_initial_data(self, model):
         return {

misago/apps/admin/roles/views.py

@@ -63,10 +63,10 @@ class New(FormWidget):
     form = RoleForm
     submit_button = _("Save Role")
         
-    def get_new_url(self, model):
+    def get_new_link(self, model):
         return reverse('admin_roles_new')
     
-    def get_edit_url(self, model):
+    def get_edit_link(self, model):
         return reverse('admin_roles_edit', model)
     
     def submit_form(self, form, target):
@@ -88,11 +88,11 @@ class Edit(FormWidget):
     notfound_message = _('Requested Role could not be found.')
     submit_fallback = True
     
-    def get_url(self, model):
+    def get_link(self, model):
         return reverse('admin_roles_edit', model)
     
-    def get_edit_url(self, model):
-        return self.get_url(model)
+    def get_edit_link(self, model):
+        return self.get_link(model)
     
     def get_initial_data(self, model):
         if self.request.user.is_god():
@@ -125,7 +125,7 @@ class Forums(ListWidget):
     empty_message = _('No forums are currently defined.')
     template = 'forums'
     
-    def get_url(self):
+    def get_link(self):
         return reverse('admin_roles_masks', self.role) 
     
     def get_items(self):
@@ -167,7 +167,7 @@ class Forums(ListWidget):
         role_perms['forums'] = perms
         self.role.permissions = role_perms
         self.role.save(force_update=True)
-        return Message(_('Forum permissions have been saved.'), 'success'), self.get_url()
+        return Message(_('Forum permissions have been saved.'), 'success'), self.get_link()
         
     def __call__(self, request, slug, target):
         self.request = request
@@ -201,11 +201,11 @@ class ACL(FormWidget):
         self.form = build_form(self.request, target)
         return self.form
     
-    def get_url(self, model):
+    def get_link(self, model):
         return reverse('admin_roles_acl', model)
     
-    def get_edit_url(self, model):
-        return self.get_url(model)
+    def get_edit_link(self, model):
+        return self.get_link(model)
     
     def get_initial_data(self, model):
         raw_acl = model.permissions

misago/apps/admin/users/views.py

@@ -237,10 +237,10 @@ class New(FormWidget):
     form = NewUserForm
     submit_button = _("Save User")
 
-    def get_new_url(self, model):
+    def get_new_link(self, model):
         return reverse('admin_users_new')
 
-    def get_edit_url(self, model):
+    def get_edit_link(self, model):
         return reverse('admin_users_edit', model)
 
     def submit_form(self, form, target):
@@ -280,11 +280,11 @@ class Edit(FormWidget):
             return form(model, self.request.POST, request=self.request, initial=self.get_initial_data(model))
         return form(model, request=self.request, initial=self.get_initial_data(model))
 
-    def get_url(self, model):
+    def get_link(self, model):
         return reverse('admin_users_edit', model)
 
-    def get_edit_url(self, model):
-        return self.get_url(model)
+    def get_edit_link(self, model):
+        return self.get_link(model)
 
     def get_initial_data(self, model):
         return {

misago/apps/admin/widgets.py

@@ -37,7 +37,7 @@ class BaseWidget(object):
     def get_token(self, token):
         return '%s_%s_%s' % (self.id, token, str('%s.%s' % (self.admin.id, self.admin.model.__name__)))
 
-    def get_url(self):
+    def get_link(self):
         return reverse(self.admin.get_action_attr(self.id, 'route'))
 
     def get_name(self):
@@ -56,7 +56,7 @@ class BaseWidget(object):
     def add_template_variables(self, variables):
         return variables
 
-    def get_fallback_url(self):
+    def get_fallback_link(self):
         return reverse(self.fallback)
 
     def get_target(self, model):
@@ -206,7 +206,7 @@ class ListWidget(BaseWidget):
     def sort_items(self, page_items, sorting_method):
         return page_items.order_by(sorting_method[2])
 
-    def get_pagination_url(self, page):
+    def get_pagination_link(self, page):
         return reverse(self.admin.get_action_attr(self.id, 'route'), kwargs={'page': page})
 
     def get_pagination(self, total, page):
@@ -241,7 +241,7 @@ class ListWidget(BaseWidget):
         try:
             paginating_method = self.get_pagination(items_total, page)
         except Http404:
-            return redirect(self.get_url())
+            return redirect(self.get_link())
 
         # List items
         items = self.get_items()
@@ -287,7 +287,7 @@ class ListWidget(BaseWidget):
                             message = Message(_("No search criteria have been defined."))
                         else:
                             request.session[self.get_token('filter')] = search_criteria
-                            return redirect(self.get_url())
+                            return redirect(self.get_link())
                     else:
                         message = Message(_("Search form contains errors."))
                     message.type = 'error'
@@ -298,7 +298,7 @@ class ListWidget(BaseWidget):
                 if request.POST.get('origin') == 'clear' and self.is_filtering and request.csrf.request_secure(request):
                     request.session[self.get_token('filter')] = None
                     request.messages.set_flash(Message(_("Search criteria have been cleared.")), 'info', self.admin.id)
-                    return redirect(self.get_url())
+                    return redirect(self.get_link())
             else:
                 if self.is_filtering:
                     search_form = SearchForm(request=request, initial=request.session.get(self.get_token('filter')))
@@ -312,10 +312,10 @@ class ListWidget(BaseWidget):
             if request.method == 'POST' and request.POST.get('origin') == 'table':
                 table_form = TableForm(request.POST, request=request)
                 if table_form.is_valid():
-                    message, redirect_url = self.table_action(items, table_form.cleaned_data)
-                    if redirect_url:
+                    message, redirect_link = self.table_action(items, table_form.cleaned_data)
+                    if redirect_link:
                         request.messages.set_flash(message, message.type, self.admin.id)
-                        return redirect(redirect_url)
+                        return redirect(redirect_link)
                 else:
                     message = Message(table_form.non_field_errors()[0], 'error')
             else:
@@ -330,10 +330,10 @@ class ListWidget(BaseWidget):
                 if list_form.is_valid():
                     try:
                         form_action = getattr(self, 'action_' + list_form.cleaned_data['list_action'])
-                        message, redirect_url = form_action(items, [int(x) for x in list_form.cleaned_data['list_items']])
-                        if redirect_url:
+                        message, redirect_link = form_action(items, [int(x) for x in list_form.cleaned_data['list_items']])
+                        if redirect_link:
                             request.messages.set_flash(message, message.type, self.admin.id)
-                            return redirect(redirect_url)
+                            return redirect(redirect_link)
                     except AttributeError:
                         message = Message(_("Requested action is incorrect."))
                 else:
@@ -358,7 +358,7 @@ class ListWidget(BaseWidget):
                                    'admin': self.admin,
                                    'action': self,
                                    'request': request,
-                                   'link': self.get_url(),
+                                   'link': self.get_link(),
                                    'messages_log': request.messages.get_messages(self.admin.id),
                                    'message': message,
                                    'sorting': self.sortables,
@@ -388,7 +388,7 @@ class FormWidget(BaseWidget):
     original_name = None
     submit_fallback = False
 
-    def get_url(self, model):
+    def get_link(self, model):
         return reverse(self.admin.get_action_attr(self.id, 'route'))
 
     def get_form(self, target):
@@ -422,7 +422,7 @@ class FormWidget(BaseWidget):
             model = self.get_and_validate_target(target)
             self.original_name = self.get_target_name(model)
             if not model:
-                return redirect(self.get_fallback_url())
+                return redirect(self.get_fallback_link())
         original_model = model
 
         # Get form type to instantiate
@@ -439,21 +439,21 @@ class FormWidget(BaseWidget):
                         request.messages.set_flash(message, message.type, self.admin.id)
                         # Redirect back to right page
                         try:
-                            if 'save_new' in request.POST and self.get_new_url:
-                                return redirect(self.get_new_url(model))
+                            if 'save_new' in request.POST and self.get_new_link:
+                                return redirect(self.get_new_link(model))
                         except AttributeError:
                             pass
                         try:
-                            if 'save_edit' in request.POST and self.get_edit_url:
-                                return redirect(self.get_edit_url(model))
+                            if 'save_edit' in request.POST and self.get_edit_link:
+                                return redirect(self.get_edit_link(model))
                         except AttributeError:
                             pass
                         try:
-                            if self.get_submit_url:
-                                return redirect(self.get_submit_url(model))
+                            if self.get_submit_link:
+                                return redirect(self.get_submit_link(model))
                         except AttributeError:
                             pass
-                        return redirect(self.get_fallback_url())
+                        return redirect(self.get_fallback_link())
                 except ValidationError as e:
                     message = Message(e.messages[0], 'error')
             else:
@@ -467,8 +467,8 @@ class FormWidget(BaseWidget):
                                    'admin': self.admin,
                                    'action': self,
                                    'request': request,
-                                   'link': self.get_url(model),
-                                   'fallback': self.get_fallback_url(),
+                                   'link': self.get_link(model),
+                                   'fallback': self.get_fallback_link(),
                                    'messages_log': request.messages.get_messages(self.admin.id),
                                    'message': message,
                                    'tabbed': self.tabbed,
@@ -496,20 +496,20 @@ class ButtonWidget(BaseWidget):
         if target:
             model = self.get_and_validate_target(target)
             if not model:
-                return redirect(self.get_fallback_url())
+                return redirect(self.get_fallback_link())
         original_model = model
 
         # Crash if this is invalid request
         if not request.csrf.request_secure(request):
             request.messages.set_flash(Message(_("Action authorization is invalid.")), 'error', self.admin.id)
-            return redirect(self.get_fallback_url())
+            return redirect(self.get_fallback_link())
 
         # Do something
         message, url = self.action(model)
         request.messages.set_flash(message, message.type, self.admin.id)
         if url:
             return redirect(url)
-        return redirect(self.get_fallback_url())
+        return redirect(self.get_fallback_link())
 
     def action(self, target):
         """

misago/middleware/threading.py

@@ -1,6 +0,0 @@
-from misago.thread import clear
-
-class ThreadMiddleware(object):
-    def process_response(self, request, response):
-        clear()
-        return response

misago/models/settingmodel.py

@@ -77,7 +77,7 @@ class Setting(models.Model):
         # Yes-no
         if self.field == 'yesno':
             return forms.BooleanField(
-                                   initial=self.get_value(),
+                                   initial=self.value,
                                    label=_(self.name),
                                    help_text=_(self.description) if self.description else None,
                                    required=False,
@@ -87,7 +87,7 @@ class Setting(models.Model):
         # Multi-list
         if self.field == 'mlist':
             return forms.MultipleChoiceField(
-                                     initial=self.get_value(),
+                                     initial=self.value,
                                      label=_(self.name),
                                      help_text=_(self.description) if self.description else None,
                                      widget=forms.CheckboxSelectMultiple,
@@ -102,7 +102,7 @@ class Setting(models.Model):
             if extra['choices'] == '#TZ#':
                 extra['choices'] = tzlist()
             return forms.ChoiceField(
-                                     initial=self.get_value(),
+                                     initial=self.value,
                                      label=_(self.name),
                                      help_text=_(self.description) if self.description else None,
                                      widget=forms.RadioSelect if self.field == 'choice' else forms.Select,
@@ -114,7 +114,7 @@ class Setting(models.Model):
         # Textarea
         if self.field == 'textarea':
             return forms.CharField(
-                                   initial=self.get_value(),
+                                   initial=self.value,
                                    label=_(self.name),
                                    help_text=_(self.description) if self.description else None,
                                    validators=field_validators,
@@ -131,7 +131,7 @@ class Setting(models.Model):
 
         # Make text-input
         return default_input(
-                             initial=self.get_value(),
+                             initial=self.value,
                              label=_(self.name),
                              help_text=_(self.description) if self.description else None,
                              validators=field_validators,

templates/admin/admin/acl_form.html

@@ -31,10 +31,10 @@
   	{% block form_submit %}
   	<button name="save" type="submit" class="btn btn-primary">{{ action.submit_button }}</button>
   	{% endblock %}
-  	{% if action.get_edit_url -%}
+  	{% if action.get_edit_link -%}
   	<button name="save_edit" type="submit" class="btn btn-warning">{% trans %}Save and Edit{% endtrans %}</button>
   	{%- endif %}
-  	{% if action.get_new_url -%}
+  	{% if action.get_new_link -%}
   	<button name="save_new" type="submit" class="btn btn-success">{% trans %}Save and Add Another{% endtrans %}</button>
   	{%- endif %}
   	{% if fallback %}<a href="{{ fallback }}" class="btn">{% trans %}Cancel{% endtrans %}</a>{% endif %}

templates/admin/admin/form.html

@@ -26,10 +26,10 @@
   	{% block form_submit %}
   	<button name="save" type="submit" class="btn btn-primary">{{ action.submit_button }}</button>
   	{% endblock %}
-  	{% if action.get_edit_url -%}
+  	{% if action.get_edit_link -%}
   	<button name="save_edit" type="submit" class="btn btn-warning">{% trans %}Save and Edit{% endtrans %}</button>
   	{%- endif %}
-  	{% if action.get_new_url -%}
+  	{% if action.get_new_link -%}
   	<button name="save_new" type="submit" class="btn btn-success">{% trans %}Save and Add Another{% endtrans %}</button>
   	{%- endif %}
   	{% if fallback %}<a href="{{ fallback }}" class="btn">{% trans %}Cancel{% endtrans %}</a>{% endif %}

templates/admin/admin/list.html

@@ -57,8 +57,8 @@
   {% endif %}
   {% if pagination and (pagination['prev'] > 0 or pagination['next'] > 0) %}
   <ul class="pager pull-left">
-    {%- if pagination['prev'] > 0 %}<li><a href="{{ action.get_pagination_url(pagination['prev']) }}" class="tooltip-top" title="{% trans %}Previous Page{% endtrans %}"><i class="icon-chevron-left"></i></a></li>{% endif -%}
-    {%- if pagination['next'] > 0 %}<li><a href="{{ action.get_pagination_url(pagination['next']) }}" class="tooltip-top" title="{% trans %}Next Page{% endtrans %}"><i class="icon-chevron-right"></i></a></li>{% endif -%}
+    {%- if pagination['prev'] > 0 %}<li><a href="{{ action.get_pagination_link(pagination['prev']) }}" class="tooltip-top" title="{% trans %}Previous Page{% endtrans %}"><i class="icon-chevron-left"></i></a></li>{% endif -%}
+    {%- if pagination['next'] > 0 %}<li><a href="{{ action.get_pagination_link(pagination['next']) }}" class="tooltip-top" title="{% trans %}Next Page{% endtrans %}"><i class="icon-chevron-right"></i></a></li>{% endif -%}
   </ul>
   <div class="table-count pull-left">{%- trans current_page=pagination['page'], pages=pagination['total'] -%}
   Page {{ current_page }} of {{ pages }}

templates/admin/processing.html

@@ -16,7 +16,7 @@
           	  <p>{{ message }}</p>
             </div>
             <div class="form-actions">
-              <a href="{{ cancel_url }}" class="btn pull-right"><i class="icon-home"></i> {% trans %}Cancel Task{% endtrans %}</a>
+              <a href="{{ cancel_link }}" class="btn pull-right"><i class="icon-home"></i> {% trans %}Cancel Task{% endtrans %}</a>
             </div>
           </form>
 {% endblock %}