zen 0.2.5 → 0.2.6

data/lib/zen/package/comments/lib/comments/plugin/comments.rb

@@ -71,8 +71,8 @@ module Comments
 
         # Now that we have the entry and the section we can start retrieving all the 
         # comments.
-        comments = Comment.filter(:section_entry_id => entry.id)
-          .limit(@options[:limit], @options[:offset])
+        comments = Comment.filter(:section_entry_id => entry.id) \
+          .limit(@options[:limit], @options[:offset]) \
           .all
 
         # Don't bother with all code below this if/end if we don't want to convert the
@@ -105,7 +105,6 @@ module Comments
 
         return comments
       end
-
-    end
-  end
-end
+    end # Comments
+  end # Plugin
+end # Comments

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

@@ -21,7 +21,7 @@
                 <th>#{lang('comments.labels.name')}</th>
                 <th>#{lang('comments.labels.email')}</th>
                 <th>#{lang('comments.labels.website')}</th>
-                <th>#{lang('comments.labels.defensio_signature')}</th>
+                <th>#{lang('comments.labels.created_at')}</th>
              </thead>
             <tbody> 
                 <?r @comments.each do |comment| ?>
@@ -58,7 +58,7 @@
                     <td>#{user.email}</td>
                     <td>#{user.website}</td>
                     <?r end ?>
-                    <td>#{comment.defensio_signature}</td>
+                    <td>#{comment.created_at.strftime(session[:user].date_format)}</td>
                 </tr>
                 <?r end ?>
             </tbody>

data/lib/zen/package/custom_fields/lib/custom_fields/controller/custom_field_groups.rb

@@ -14,13 +14,13 @@ module CustomFields
       include ::CustomFields::Model
 
       map('/admin/custom-field-groups')
-      
+
       before_all do
         csrf_protection(:save, :delete) do
           respond(lang('zen_general.errors.csrf'), 403)
         end
       end
-      
+
       ##
       # Constructor method, called upon initialization. It's used to set the
       # URL to which forms send their data and load the language pack.
@@ -34,19 +34,19 @@ module CustomFields
       #
       def initialize
         super
-        
+
         @form_save_url     = CustomFieldGroups.r(:save)
         @form_delete_url   = CustomFieldGroups.r(:delete)
 
         Zen::Language.load('custom_field_groups')
-        
+
         # Set the page title
         if !action.method.nil?
           method      = action.method.to_sym
           @page_title = lang("custom_field_groups.titles.#{method}") rescue nil
         end
       end
-      
+
       ##
       # Show an overview of all existing custom field groups. Using this overview a user
       # can manage an existing field group, delete it or create a new one.
@@ -54,7 +54,7 @@ module CustomFields
       # This method requires the following permissions:
       #
       # * read
-      # 
+      #
       # @author Yorick Peterse
       # @since  0.1
       #
@@ -62,12 +62,12 @@ module CustomFields
         if !user_authorized?([:read])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(lang('custom_field_groups.titles.index'))
-        
+
         @field_groups = CustomFieldGroup.all
       end
-      
+
       ##
       # Show a form that lets the user edit an existing custom field group.
       #
@@ -77,27 +77,27 @@ module CustomFields
       # * update
       #
       # @author Yorick Peterse
-      # @param  [Integer] id The ID of the custom field group to retrieve so that we 
+      # @param  [Integer] id The ID of the custom field group to retrieve so that we
       # can edit it.
       # @since  0.1
       #
-      def edit id
+      def edit(id)
         if !user_authorized?([:read, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
-          anchor_to(lang('custom_field_groups.titles.index'), CustomFieldGroups.r(:index)), 
+          anchor_to(lang('custom_field_groups.titles.index'), CustomFieldGroups.r(:index)),
           @page_title
         )
-        
+
         if flash[:form_data]
           @field_group = flash[:form_data]
         else
           @field_group = CustomFieldGroup[id.to_i]
         end
       end
-      
+
       ##
       # Show a form that lets the user create a new custom field group.
       #
@@ -113,15 +113,15 @@ module CustomFields
         if !user_authorized?([:read, :create])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
-          anchor_to(lang('custom_field_groups.titles.index'), CustomFieldGroups.r(:index)), 
+          anchor_to(lang('custom_field_groups.titles.index'), CustomFieldGroups.r(:index)),
           @page_title
         )
-        
+
         @field_group = CustomFieldGroup.new
       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
@@ -139,43 +139,46 @@ module CustomFields
         if !user_authorized?([:create, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
-        post = request.params.dup
-        
+
+        post = request.subset(:id, :name, :description)
+
         # Get or create a custom field group based on the ID from the hidden field.
         if post['id'] and !post['id'].empty?
-          @field_group  = CustomFieldGroup[post['id'].to_i]
+          @field_group  = CustomFieldGroup[post['id']]
           save_action   = :save
         else
           @field_group  = CustomFieldGroup.new
           save_action   = :new
         end
-        
+
+        post.delete('id')
+
+        # Set the messages
         flash_success = lang("custom_field_groups.success.#{save_action}")
         flash_error   = lang("custom_field_groups.errors.#{save_action}")
-        
+
         begin
           @field_group.update(post)
-          notification(:success, lang("custom_field_groups.titles.index"), flash_success)
+          message(:success, flash_success)
         rescue
-          notification(:error, lang("custom_field_groups.titles.index"), flash_error)
+          message(:error, flash_error)
 
           flash[:form_errors] = @field_group.errors
           flash[:form_data]   = @field_group
         end
-        
+
         if !@field_group.nil? and @field_group.id
           redirect(CustomFieldGroups.r(:edit, @field_group.id))
         else
           redirect(CustomFieldGroups.r(:new))
         end
       end
-      
+
       ##
       # Delete an existing custom field group.
       #
-      # In order to delete a custom field group you'll need to send a POST request 
-      # that contains a field named 'custom_field_group_ids[]'. This field should 
+      # In order to delete a custom field group you'll need to send a POST request
+      # that contains a field named 'custom_field_group_ids[]'. This field should
       # contain the primary values of each field group that has to be deleted.
       #
       # This method requires the following permissions:
@@ -189,35 +192,23 @@ module CustomFields
         if !user_authorized?([:delete])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         if !request.params['custom_field_group_ids'] or request.params['custom_field_group_ids'].empty?
-          notification(
-            :error, 
-            lang('custom_field_groups.titles.index'), 
-            lang('custom_field_groups.errors.no_delete')
-          )
+          message(:error, lang('custom_field_groups.errors.no_delete'))
           redirect(CustomFieldGroups.r(:index))
         end
-        
+
         request.params['custom_field_group_ids'].each do |id|
           begin
             CustomFieldGroup[id.to_i].destroy
-            notification(
-              :success, 
-              lang('custom_field_groups.titles.index'), 
-              lang('custom_field_groups.success.delete')
-            )
+            message(:success, lang('custom_field_groups.success.delete'))
           rescue
-            notification(
-              :error, 
-              lang('custom_field_groups.titles.index'), 
-              lang('custom_field_groups.errors.delete') % id
-            )
+            message(:error, lang('custom_field_groups.errors.delete') % id)
           end
         end
-        
+
         redirect_referrer
       end
-    end
-  end
-end
+    end # CustomFieldGroups
+  end # Controller
+end # CustomFields

data/lib/zen/package/custom_fields/lib/custom_fields/controller/custom_fields.rb

@@ -16,13 +16,16 @@ module CustomFields
       include ::CustomFields::Model
 
       map('/admin/custom-fields')
-      
+
+      # Load all required Javascript files
+      javascript ['zen/tabs']
+
       before_all do
         csrf_protection(:save, :delete) do
           respond(lang('zen_general.errors.csrf'), 403)
         end
       end
-      
+
       ##
       # Constructor method, called upon initialization. It's used to set the
       # URL to which forms send their data and load the language pack.
@@ -37,13 +40,13 @@ module CustomFields
       #
       def initialize
         super
-        
+
         @form_save_url     = CustomFields.r(:save)
         @form_delete_url   = CustomFields.r(:delete)
-        
+
         Zen::Language.load('custom_fields')
         Zen::Language.load('custom_field_groups')
-        
+
         # Set the page title
         if !action.method.nil?
           method      = action.method.to_sym
@@ -61,7 +64,7 @@ module CustomFields
           'select_multiple' => lang('custom_fields.special.type_hash.select_multiple')
         }
       end
-      
+
       ##
       # Show an overview of all existing custom fields. Using this overview a user
       # can manage an existing field, delete it or create a new one.
@@ -69,26 +72,26 @@ module CustomFields
       # This method requires the following permissions:
       #
       # * read
-      # 
+      #
       # @author Yorick Peterse
-      # @param  [Integer] custom_field_group_id The ID of the custom field group to 
+      # @param  [Integer] custom_field_group_id The ID of the custom field group to
       # which all fields belong.
       # @since  0.1
       #
-      def index custom_field_group_id
+      def index(custom_field_group_id)
         if !user_authorized?([:read])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
           anchor_to(lang('custom_field_groups.titles.index'), CustomFieldGroups.r(:index)),
           lang('custom_fields.titles.index')
         )
-        
-        @custom_field_group_id  = custom_field_group_id.to_i
-        @custom_fields          = CustomFieldGroup[@custom_field_group_id].custom_fields
+
+        @custom_field_group_id = custom_field_group_id.to_i
+        @custom_fields         = CustomFieldGroup[@custom_field_group_id].custom_fields
       end
-      
+
       ##
       # Show a form that lets the user edit an existing custom field group.
       #
@@ -98,22 +101,22 @@ module CustomFields
       # * update
       #
       # @author Yorick Peterse
-      # @param  [Integer] custom_field_group_id The ID of the custom field group to 
+      # @param  [Integer] custom_field_group_id The ID of the custom field group to
       # which all fields belong.
       # @param  [Integer] id The ID of the custom field to retrieve so that we can edit it.
       # @since  0.1
       #
-      def edit custom_field_group_id, id
+      def edit(custom_field_group_id, id)
         if !user_authorized?([:read, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
           anchor_to(lang('custom_field_groups.titles.index'), CustomFieldGroups.r(:index)),
           anchor_to(lang('custom_fields.titles.index'), CustomFields.r(:index, custom_field_group_id)),
           lang('custom_fields.titles.edit')
         )
-          
+
         @custom_field_group_id = custom_field_group_id
 
         if flash[:form_data]
@@ -122,7 +125,7 @@ module CustomFields
           @custom_field = CustomField[id.to_i]
         end
       end
-      
+
       ##
       # Show a form that lets the user create a new custom field group.
       #
@@ -132,25 +135,31 @@ module CustomFields
       # * read
       #
       # @author Yorick Peterse
-      # @param  [Integer] custom_field_group_id The ID of the custom field group to 
+      # @param  [Integer] custom_field_group_id The ID of the custom field group to
       # which all fields belong.
       # @since  0.1
       #
-      def new custom_field_group_id
+      def new(custom_field_group_id)
         if !user_authorized?([:read, :create])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
-          anchor_to(lang('custom_field_groups.titles.index'), CustomFieldGroups.r(:index)),
-          anchor_to(lang('custom_fields.titles.index'), CustomFields.r(:index, custom_field_group_id)),
+          anchor_to(
+            lang('custom_field_groups.titles.index'),
+            CustomFieldGroups.r(:index)
+          ),
+          anchor_to(
+            lang('custom_fields.titles.index'),
+            CustomFields.r(:index, custom_field_group_id)
+          ),
           lang('custom_fields.titles.index')
         )
-        
+
         @custom_field_group_id = custom_field_group_id
         @custom_field          = CustomField.new
       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
@@ -168,46 +177,50 @@ module CustomFields
         if !user_authorized?([:create, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
-        post                  = request.params.dup
-        custom_field_group_id = post['custom_field_group_id']
-        
-        post.delete('slug') if post['slug'].empty?
+
+        post = request.subset(
+          :id, :name, :slug, :description, :sort_order, :type, :format, :possible_values,
+          :required, :visual_editor, :textarea_rows, :text_limit, :custom_field_group_id
+        )
 
         # Get or create a custom field group based on the ID from the hidden field.
         if post['id'] and !post['id'].empty?
-          @custom_field = CustomField[post['id'].to_i]
+          @custom_field = CustomField[post['id']]
           save_action   = :save
         else
           @custom_field = CustomField.new
           save_action   = :new
         end
-        
+
+        post.delete('slug') if post['slug'].empty?
+        post.delete('id')
+
         flash_success = lang("custom_fields.success.#{save_action}")
         flash_error   = lang("custom_fields.errors.#{save_action}")
 
         begin
           @custom_field.update(post)
-          notification(:success, lang('custom_fields.titles.index'), flash_success)
-        rescue
-          notification(:error, lang('custom_fields.titles.index'), flash_error)
+          message(:success, flash_success)
+        rescue => e
+          Ramaze::Log.error(e.inspect)
+          message(:error, flash_error)
 
           flash[:form_data]   = @custom_field
           flash[:form_errors] = @custom_field.errors
         end
-        
+
         if @custom_field.id
-          redirect(CustomFields.r(:edit, custom_field_group_id, @custom_field.id))
+          redirect(CustomFields.r(:edit, post['custom_field_group_id'], @custom_field.id))
         else
-          redirect(CustomFields.r(:new, custom_field_group_id))
+          redirect_referrer
         end
       end
-      
+
       ##
       # Delete an existing custom field.
       #
-      # In order to delete a custom field group you'll need to send a POST request that 
-      # contains a field named 'custom_field_ids[]'. This field should contain the 
+      # In order to delete a custom field group you'll need to send a POST request that
+      # contains a field named 'custom_field_ids[]'. This field should contain the
       # primary values of each field that has to be deleted.
       #
       # This method requires the following permissions:
@@ -222,37 +235,25 @@ module CustomFields
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
 
-        post = request.params.dup
-        
-        if !request.params['custom_field_ids'] or request.params['custom_field_ids'].empty?
-          notification(
-            :error, 
-            lang('custom_fields.titles.index'), 
-            lang('custom_fields.errors.no_delete')
-          )
+        post = request.subset(:custom_field_ids, :custom_field_group_id)
 
+        if !request.params['custom_field_ids'] or request.params['custom_field_ids'].empty?
+          message(:error, lang('custom_fields.errors.no_delete'))
           redirect(CustomFields.r(:index, post['custom_field_group_id']))
         end
-        
+
         request.params['custom_field_ids'].each do |id|
           begin
-            CustomField[id.to_i].destroy
-            notification(
-              :success, 
-              lang('custom_fields.titles.index'), 
-              lang('custom_fields.success.delete')
-            )
-          rescue
-            notification(
-              :error, 
-              lang('custom_fields.titles.index'), 
-              lang('custom_fields.errors.delete') % id
-            )
+            CustomField[id].destroy
+            message(:success, lang('custom_fields.success.delete'))
+          rescue => e
+            Ramaze::Log.error(e.inspect)
+            message(:error, lang('custom_fields.errors.delete') % id)
           end
         end
-        
+
         redirect_referrer
       end
-    end
-  end
-end
+    end # CustomFields
+  end # Controller
+end # CustomFields