zen 0.2.7 → 0.2.8

data/lib/zen/package/menus/lib/menus/view/admin/menu-items/index.xhtml

@@ -3,15 +3,15 @@
         <h1>#{get_breadcrumbs}</h1>
     </header>
 
-    <form method="post" action="#{@form_delete_url}">
+    <form method="post" action="#{Menus::Controller::MenuItems.r(:delete)}">
         <input name="csrf_token" type="hidden" value="#{get_csrf_token}" />
 
-        <?r if @menu_items and !@menu_items.empty? ?>
-        <table class="table">
+        <?r if !@menu_items.empty? ?>
+        <table>
             <thead>
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
-                    <th>
+                    <th class="no_sort">
                         <input type="checkbox" />
                     </th>
                     <?r end ?>
@@ -21,8 +21,8 @@
                     <th>#{lang('menu_items.labels.url')}</th>
                     <th>#{lang('menu_items.labels.parent_id')}</th>
                     <th>#{lang('menu_items.labels.order')}</th>
-                    <th>#{lang('menu_items.labels.css_class')}</th>
-                    <th>#{lang('menu_items.labels.css_id')}</th>
+                    <th>#{lang('menu_items.labels.html_class')}</th>
+                    <th>#{lang('menu_items.labels.html_id')}</th>
                 </tr>
             </thead>
             <tbody>
@@ -31,7 +31,8 @@
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
                     <td>
-                        <input name="menu_item_ids[]" type="checkbox" value="#{item.id}" />
+                        <input name="menu_item_ids[]" type="checkbox"
+                        value="#{item.id}" />
                     </td>
                     <?r end ?>
 
@@ -39,46 +40,50 @@
 
                     <?r if user_authorized?([:update]) ?>
                     <td>
-                        #{anchor_to(
-                          item.name, 
-                          Menus::Controller::MenuItems.r(:edit, @menu_id, item.id)
+                        #{Menus::Controller::MenuItems.a(
+                          item.name, :edit, @menu_id, item.id
                         )}
                     </td>
                     <?r else ?>
                     <td>#{item.name}</td>
                     <?r end ?>
 
-                    <td>#{anchor_to(item.url, item.url)}</td>
+                    <td>
+                        <a href="#{item.url}">#{item.url}</a>
+                    </td>
+
                     <td>#{item.ancestors.map { |a| a.name }.join(', ')}</td>
-                    <td>#{item.order}</td>
-                    <td>#{item.css_class}</td>
-                    <td>#{item.css_id}</td>
+                    <td>#{item.sort_order}</td>
+                    <td>#{item.html_class}</td>
+                    <td>#{item.html_id}</td>
                 </tr>
                 <?r end ?>
 
             </tbody>
         </table>
 
+        #{
+        if @menu_items.respond_to?(:navigation) and @menu_items.page_count > 1
+          @menu_items.navigation
+        end
+        }
+
         <?r else ?>
         <p>#{lang('menu_items.messages.no_items')}</p>
         <?r end ?>
 
-        <div class="clearfix">
-            <?r if user_authorized?([:create, :read]) ?>
-            <div class="button">
-                #{anchor_to(
-                  lang('menu_items.buttons.new'), 
-                  Menus::Controller::MenuItems.r(:new, @menu_id)
-                )}
-            </div>
-            <?r end ?>
-
-            <?r if user_authorized?([:delete]) ?>
-            <div class="button">
-                <input type="submit" value="#{lang('menu_items.buttons.delete')}" />
-            </div>
-            <?r end ?>
+        <?r if user_authorized?([:create, :read]) ?>
+        <div class="button">
+            #{Menus::Controller::MenuItems.a(
+              lang('menu_items.buttons.new'), :new, @menu_id
+            )}
         </div>
-    </form> 
+        <?r end ?>
 
+        <?r if user_authorized?([:delete]) ?>
+        <div class="button">
+            <input type="submit" value="#{lang('menu_items.buttons.delete')}" />
+        </div>
+        <?r end ?>
+    </form>
 </article>

data/lib/zen/package/menus/lib/menus/view/admin/menus/form.xhtml

@@ -1,42 +1,51 @@
-#{
-form_for(@menu, :method => :post, :action => @form_save_url, :id => :menu_form) do |f| 
-  f.input_hidden(:csrf_token, get_csrf_token)
-  f.input_hidden(:id        , @menu.id)
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
 
-  f.input_text(
-    lang('menus.labels.name'), 
-    :name, 
-    :placeholder => lang('menus.placeholders.name') 
-  )
+    #{
+    form_for(
+      @menu, 
+      :method => :post, 
+      :action => Menus::Controller::Menus.r(:save), 
+      :id     => :menu_form
+    ) do |f| 
+      f.input_hidden(:csrf_token, get_csrf_token)
+      f.input_hidden(:id        , @menu.id)
 
-  f.input_text(
-    lang('menus.labels.slug'), 
-    :slug, 
-    :placeholder => lang('menus.placeholders.slug')
-  )
-    
-  f.input_text(
-    lang('menus.labels.css_class'), 
-    :css_class, 
-    :placeholder => lang('menus.placeholders.css_class')
-  )
+      f.input_text(
+        lang('menus.labels.name'), 
+        :name, 
+        :placeholder => lang('menus.placeholders.name') 
+      )
 
-  f.input_text(
-    lang('menus.labels.css_id'), 
-    :css_id, 
-    :placeholder => lang('menus.placeholders.css_id')
-  )
+      f.input_text(
+        lang('menus.labels.slug'), 
+        :slug, 
+        :placeholder => lang('menus.placeholders.slug')
+      )
+        
+      f.input_text(
+        lang('menus.labels.html_class'), 
+        :html_class, 
+        :placeholder => lang('menus.placeholders.html_class')
+      )
 
-  f.textarea(
-    lang('menus.labels.description'), 
-    :description, 
-    :rows => 8
-  )
-  
-  f.g.div(:class => "clearfix") do
-    f.g.div(:class => "button") do
-      f.g.input(:type => :submit, :value => lang('menus.buttons.save'))
+      f.input_text(
+        lang('menus.labels.html_id'), 
+        :html_id, 
+        :placeholder => lang('menus.placeholders.html_id')
+      )
+
+      f.textarea(
+        lang('menus.labels.description'), 
+        :description, 
+        :rows => 8
+      )
+      
+      f.g.div(:class => "button") do
+        f.g.input(:type => :submit, :value => lang('menus.buttons.save'))
+      end
     end
-  end
-end
-}
+    }
+</article>

data/lib/zen/package/menus/lib/menus/view/admin/menus/index.xhtml

@@ -3,16 +3,16 @@
         <h1>#{get_breadcrumbs}</h1>
     </header>
 
-    <form action="#{@form_delete_url}" method="post">
+    <form action="#{Menus::Controller::Menus.r(:delete)}" method="post">
         <input name="csrf_token" type="hidden" value="#{get_csrf_token}" />
 
         <?r if @menus and !@menus.empty? ?>
 
-        <table class="table">
+        <table>
             <thead>
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
-                    <th>
+                    <th class="no_sort">
                         <input type="checkbox" />
                     </th>
                     <?r end ?>
@@ -20,46 +20,46 @@
                     <th>#{lang('menus.labels.id')}</th>
                     <th>#{lang('menus.labels.name')}</th>
                     <th>#{lang('menus.labels.slug')}</th>
-                    <th>#{lang('menus.labels.css_class')}</th>
-                    <th>#{lang('menus.labels.css_id')}</th>
+                    <th>#{lang('menus.labels.html_class')}</th>
+                    <th>#{lang('menus.labels.html_id')}</th>
 
-                    <?r if user_authorized?([:read], true, 'Menus::Controller::MenuItems') ?>
+                    <?r if user_authorized?(
+                      [:read], true, 'Menus::Controller::MenuItems'
+                    ) ?>
                     <th></th>
                     <?r end ?>
                 </tr>
             </thead>
-
             <tbody>
                 <?r @menus.each do |menu| ?>
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
                     <td>
-                        <input type="checkbox" name="menu_ids[]" value="#{menu.id}" />
+                        <input type="checkbox" name="menu_ids[]"
+                        value="#{menu.id}" />
                     </td>
                     <?r end ?>
 
                     <td>#{menu.id}</td>
-                    
+
                     <?r if user_authorized?([:update]) ?>
                     <td>
-                        #{anchor_to(
-                          menu.name, 
-                          Menus::Controller::Menus.r(:edit, menu.id)
-                        )}
+                        #{Menus::Controller::Menus.a(menu.name, :edit, menu.id)}
                     </td>
                     <?r else ?>
                     <td>#{menu.name}</td>
                     <?r end ?>
 
                     <td>#{menu.slug}</td>
-                    <td>#{menu.css_class}</td>
-                    <td>#{menu.css_id}</td>
+                    <td>#{menu.html_class}</td>
+                    <td>#{menu.html_id}</td>
 
-                    <?r if user_authorized?([:read], true, 'Menus::Controller::MenuItems') ?>
+                    <?r if user_authorized?(
+                      [:read], true, 'Menus::Controller::MenuItems'
+                    ) ?>
                     <td>
-                        #{anchor_to(
-                          lang('menus.labels.manage_items'), 
-                          Menus::Controller::MenuItems.r(:index, menu.id)
+                        #{Menus::Controller::MenuItems.a(
+                          lang('menus.labels.manage_items'), :index, menu.id
                         )}
                     </td>
                     <?r end ?>
@@ -68,28 +68,28 @@
             </tbody>
         </table>
 
+        #{
+        if @menus.respond_to?(:navigation) and @menus.page_count > 1
+          @menus.navigation
+        end
+        }
+
         <?r else ?>
         <p>#{lang('menus.messages.no_menus')}</p>
         <?r end ?>
 
-        <div class="clearfix">
-
-            <?r if user_authorized?([:create, :read]) ?>
-            <div class="button">
-                #{anchor_to(
-                  lang('menus.buttons.new'), 
-                  Menus::Controller::Menus.r(:new) 
-                )}
-            </div>
-            <?r end ?>
-
-            <?r if user_authorized?([:delete]) ?>
-            <div class="button">
-                <input type="submit" value="#{lang('menus.buttons.delete')}" />
-            </div>
-            <?r end ?>
+        <?r if user_authorized?([:create, :read]) ?>
+        <div class="button">
+            #{Menus::Controller::Menus.a(
+              lang('menus.buttons.new'), :new
+            )}
+        </div>
+        <?r end ?>
 
+        <?r if user_authorized?([:delete]) ?>
+        <div class="button">
+            <input type="submit" value="#{lang('menus.buttons.delete')}" />
         </div>
-            
-    </form>    
+        <?r end ?>
+    </form>
 </article>

data/lib/zen/package/menus/migrations/1297184342_create_schema.rb

@@ -15,16 +15,16 @@ Sequel.migration do
       primary_key :id
 
       Integer :parent_id, :index   => true
-      String :name      , :null    => false
-      String :url       , :null    => false
+      String  :name     , :null    => false
+      String  :url      , :null    => false
       Integer :order    , :default => 0
-      String :css_class
-      String :css_id
+      String  :css_class
+      String  :css_id
 
       foreign_key :menu_id, :menus, :update => :on_cascade, :on_delete => :cascade, :key => :id
     end
   end
-  
+
   down do
     drop_table :menu_items
     drop_table :menus

data/lib/zen/package/menus/migrations/1308671733_rename_order_column.rb

@@ -0,0 +1,11 @@
+Sequel.migration do
+  # Updates the database with the changes specified in the block.
+  up do
+    rename_column(:menu_items, :order, :sort_order) 
+  end
+  
+  # Reverts the changes made in the up() block.
+  down do
+    rename_column(:menu_items, :sort_order, :order)
+  end
+end

data/lib/zen/package/menus/migrations/1311695030_rename_css_class.rb

@@ -0,0 +1,17 @@
+Sequel.migration do
+  # Updates the database with the changes specified in the block.
+  up do
+    rename_column(:menu_items, :css_class, :html_class)
+    rename_column(:menu_items, :css_id   , :html_id)
+    rename_column(:menus     , :css_class, :html_class)
+    rename_column(:menus     , :css_id   , :html_id)
+  end
+
+  # Reverts the changes made in the up() block.
+  down do
+    rename_column(:menu_items, :html_class, :css_class)
+    rename_column(:menu_items, :html_id   , :css_id)
+    rename_column(:menus     , :html_class, :css_class)
+    rename_column(:menus     , :html_id   , :css_id)
+  end
+end

data/lib/zen/package/sections/lib/sections.rb

@@ -1,5 +1,8 @@
+Ramaze::HelpersHelper.options.paths.push(__DIR__('sections'))
+
 require __DIR__('sections/model/section')
 require __DIR__('sections/model/section_entry')
+require __DIR__('sections/model/section_entry_status')
 require __DIR__('sections/controller/sections')
 require __DIR__('sections/controller/section_entries')
 require __DIR__('sections/plugin/sections')
@@ -48,21 +51,25 @@ Zen::Plugin.add do |p|
 end
 
 # Register all the settings
-section_hash = {}
-
-begin
-  Sections::Model::Section.select(:name, :slug).each do |s|
-    section_hash[s.slug] = s.name
-  end
-rescue => e
-  Ramaze::Log.warn("The settings plugin failed to retrieve all sections: #{e.message}")
-end
-
 plugin(:settings, :register) do |setting|
   setting.title       = lang('settings.labels.default_section')
   setting.description = lang('settings.placeholders.default_section')
   setting.name        = 'default_section'
   setting.group       = 'general'
   setting.type        = 'select'
-  setting.values      = section_hash
+  setting.values      = lambda do
+    section_hash = {}
+
+    begin
+      Sections::Model::Section.select(:name, :id).all.each do |s|
+        section_hash[s.id] = s.name
+      end
+
+      return section_hash
+    rescue => e
+      Ramaze::Log.warn(
+        "The settings plugin failed to retrieve all sections: #{e.message}"
+      )
+    end
+  end
 end

data/lib/zen/package/sections/lib/sections/controller/section_entries.rb

@@ -13,12 +13,22 @@ module Sections
       include ::Sections::Model
 
       map '/admin/section-entries'
+      helper :section
 
       # Load all required Javascript files
-      javascript ['zen/tabs', 'zen/editor', 'vendor/datepicker']
+      javascript(
+        [
+          'zen/lib/tabs',
+          'zen/lib/editor',
+          'zen/lib/editor/markdown',
+          'zen/lib/editor/textile',
+          'vendor/datepicker'
+        ],
+        :method => [:edit, :new]
+      )
 
       # Load all required CSS files
-      stylesheet ['zen/datepicker']
+      stylesheet(['zen/datepicker'], :method => [:edit, :new])
 
       before_all do
         csrf_protection(:save, :delete) do
@@ -42,9 +52,6 @@ module Sections
       def initialize
         super
 
-        @form_save_url   = SectionEntries.r(:save)
-        @form_delete_url = SectionEntries.r(:delete)
-
         Zen::Language.load('section_entries')
         Zen::Language.load('sections')
 
@@ -53,14 +60,9 @@ module Sections
           method      = action.method.to_sym
           @page_title = lang("section_entries.titles.#{method}") rescue nil
         end
-
-        @status_hash = {
-          'draft'     => lang('section_entries.special.status_hash.draft'),
-          'published' => lang('section_entries.special.status_hash.published')
-        }
       end
 
-      ##
+      ##]
       # Show an overview of all entries for the current section.
       #
       # This method requires the following permissions:
@@ -68,22 +70,21 @@ module Sections
       # * read
       #
       # @author Yorick Peterse
-      # @param  [Integer] section_id The ID of the current section.
+      # @param  [Fixnum] section_id The ID of the current section.
       # @since  0.1
       #
       def index(section_id)
-        if !user_authorized?([:read])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:read)
 
         set_breadcrumbs(
-          anchor_to(lang('sections.titles.index'), Sections.r(:index)),
+          Sections.a(lang('sections.titles.index'), :index),
           lang('section_entries.titles.index')
         )
 
-        section     = Section[section_id.to_i]
+        section     = validate_section(section_id)
         @section_id = section_id
-        @entries    = section.section_entries
+        @entries    = SectionEntry.filter(:section_id => section_id)
+        @entries    = paginate(@entries)
       end
 
       ##
@@ -95,38 +96,36 @@ module Sections
       # * update
       #
       # @author Yorick Peterse
-      # @param  [Integer] section_id The ID of the current section.
-      # @param  [Integer] entry_id The ID of the current section entry.
+      # @param  [Fixnum] section_id The ID of the current section.
+      # @param  [Fixnum] entry_id The ID of the current section entry.
       # @since  0.1
       #
       def edit(section_id, entry_id)
-        if !user_authorized?([:read, :update])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:read, :update)
 
         set_breadcrumbs(
-          anchor_to(
-            lang('sections.titles.index'),
-            Sections.r(:index)
+          Sections.a(
+            lang('sections.titles.index'), :index
           ),
-          anchor_to(
-            lang('section_entries.titles.index'),
-            SectionEntries.r(:index, section_id)
+          SectionEntries.a(
+            lang('section_entries.titles.index'), :index, section_id
           ),
           lang('section_entries.titles.edit')
         )
 
-        @section_id = section_id
+        validate_section(section_id)
 
         if flash[:form_data]
           @entry = flash[:form_data]
         else
-          @entry = SectionEntry[entry_id.to_i]
+          @entry = validate_section_entry(entry_id, section_id)
         end
 
-        @users_hash = {}
+        @section_id          = section_id
+        @possible_categories = @entry.possible_categories
+        @custom_fields_hash  = @entry.custom_fields_hash
 
-        Users::Model::User.each { |u| @users_hash[u.id] = u.name }
+        render_view(:form)
       end
 
       ##
@@ -138,37 +137,37 @@ module Sections
       # * create
       #
       # @author Yorick Peterse
-      # @param  [Integer] section_id The ID of the current section.
+      # @param  [Fixnum] section_id The ID of the current section.
       # @since  0.1
       #
       def new(section_id)
-        if !user_authorized?([:read, :create])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:read, :create)
 
         set_breadcrumbs(
-          anchor_to(
-            lang('sections.titles.index'),
-            Sections.r(:index)
+          Sections.a(
+            lang('sections.titles.index'), :index
           ),
-          anchor_to(
-            lang('section_entries.titles.index'),
-            SectionEntries.r(:index, section_id)
+          SectionEntries.a(
+            lang('section_entries.titles.index'), :index, section_id
           ),
           lang('section_entries.titles.new')
         )
 
-        @section_id = section_id
-        @entry      = SectionEntry.new(:section_id => @section_id)
-        @users_hash = {}
+        validate_section(section_id)
+
+        @section_id          = section_id
+        @entry               = SectionEntry.new(:section_id => section_id)
+        @possible_categories = @entry.possible_categories
+        @custom_fields_hash  = @entry.custom_fields_hash
 
-        Users::Model::User.each { |u| @users_hash[u.id] = u.name }
+        render_view(:form)
       end
 
       ##
-      # Method used for processing the form data and redirecting the user back to
-      # the proper URL. Based on the value of a hidden field named "id" we'll determine
-      # if the data will be used to create a new section or to update an existing one.
+      # Method used for processing the form data and redirecting the user back
+      # to the proper URL. Based on the value of a hidden field named "id" we'll
+      # determine if the data will be used to create a new section or to update
+      # an existing one.
       #
       # This method requires the following permissions:
       #
@@ -177,81 +176,87 @@ module Sections
       #
       # @author Yorick Peterse
       # @since  0.1
-      # @todo The way this method handles the creation of field values might require some
-      # patches as it executes quite a few queries. I'll keep it as it is for now.
+      # @todo The way this method handles the creation of field values might
+      # require some patches as it executes quite a few queries. I'll keep it
+      # as it is for now.
       #
       def save
-        if !user_authorized?([:create, :update])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        section_id = request.params['section_id']
 
-        post                = request.params.dup
-        section_id          = post['section_id']
-        field_values        = post['custom_field_values']
-        custom_field_errors = {}
+        validate_section(section_id)
 
-        post.delete('custom_field_values')
-        post.delete('slug') if post['slug'].empty?
-
-        if !post['category_pks'].nil?
-          post['category_pks'].map! { |value| value.to_i }
-        else
-          post['category_pks'] = []
-        end
+        if request.params['id'] and !request.params['id'].empty?
+          require_permissions(:update)
 
-        if post['id'] and !post['id'].empty?
-          @entry        = SectionEntry[post['id']]
-          save_action   = :save
+          @entry      = SectionEntry[request.params['id']]
+          save_action = :save
 
-          # Section entries aren't considered to be updated whenever a custom field value
-          # is modified, this solves that problem
-          post['updated_at'] = Time.new
+          # Section entries aren't considered to be updated whenever a custom
+          # field value is modified, this solves that problem
+          request.params['updated_at'] = Time.new
         else
-          @entry        = SectionEntry.new
-          save_action   = :new
+          require_permissions(:create)
+
+          @entry      = SectionEntry.new(:section_id => section_id)
+          save_action = :new
         end
 
-        post.delete('id')
+        request.params.delete('slug') if request.params['slug'].empty?
+        request.params.delete('id')
 
         flash_success = lang("section_entries.success.#{save_action}")
         flash_error   = lang("section_entries.errors.#{save_action}")
+        custom_fields = @entry.custom_fields
+        field_errors  = {}
+        field_values  = {}
+
+        @entry.custom_field_values.each do |value|
+          field_values[value.custom_field_id] = value
+        end
 
-        # Transactions ahoy!
         begin
           Zen.database.transaction do
             # Update the entry itself
-            @entry.update(post)
-            message(:success, flash_success)
-
-            # Update the field values
-            field_values.each do |field_id, value|
-              field_value = CustomFields::Model::CustomFieldValue[
-                :custom_field_id  => field_id,
-                :section_entry_id => @entry.id
-              ]
-
-              if field_value.nil?
-                field_value = @entry.add_custom_field_value(
-                  :section_entry_id => @entry.id,
-                  :custom_field_id  => field_id
-                )
-              end
+            @entry.update(request.subset(
+              :title,
+              :created_at,
+              :updated_at,
+              :section_id,
+              :user_id,
+              :slug,
+              :section_entry_status_id
+            ))
 
-              # Get the custom field for the current value
-              custom_field = field_value.custom_field
+            message(:success, flash_success)
 
-              if custom_field.required and value.empty?
-                custom_field_errors[:"custom_field_values[#{field_id}]"] = \
-                  lang('zen_models.presence')
+            # Update/add all the custom field values
+            custom_fields.each do |field|
+              key = "custom_field_value_#{field.id}"
+
+              # The custom field has been submitted, let's see if we have to
+              # update it or add it.
+              if request.params.key?(key)
+                # Validate it
+                if field.required and request.params[key].empty?
+                  field_errors[:"custom_field_value_#{field.id}"] = \
+                    lang('zen_models.presence')
+
+                  raise
+                end
+
+                # Update it
+                if field_values.key?(field.id)
+                  field_values[field.id].update(:value => request.params[key])
+                # Add it
+                else
+                  @entry.add_custom_field_value(
+                    :custom_field_id => field.id,
+                    :value           => request.params[key]
+                  )
+                end
               end
-
-              raise unless custom_field_errors.empty?
-
-              field_value.value = value
-              field_value.save
             end
           end
-
         # The rescue statement is called whenever the following happens:
         #
         # 1. The fields for the section entry (title, slug, etc) are invalid
@@ -261,7 +266,7 @@ module Sections
           Ramaze::Log.error(e.inspect)
           message(:error, flash_error)
 
-          flash[:form_errors] = @entry.errors.merge(custom_field_errors)
+          flash[:form_errors] = @entry.errors.merge(field_errors)
           flash[:form_data]   = @entry
 
           redirect_referrer
@@ -286,11 +291,10 @@ module Sections
       # @since  0.1
       #
       def delete
-        if !user_authorized?([:delete])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:delete)
 
-        if !request.params['section_entry_ids'] or request.params['section_entry_ids'].empty?
+        if !request.params['section_entry_ids'] \
+        or request.params['section_entry_ids'].empty?
           message(:error, lang('section_entries.errors.no_delete'))
           redirect_referrer
         end
@@ -302,6 +306,8 @@ module Sections
           rescue => e
             Ramaze::Log.error(e.inspect)
             message(:error,lang('section_entries.errors.delete') % id)
+
+            redirect_referrer
           end
         end