zen 0.3 → 0.4

data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_group.rb

@@ -4,17 +4,40 @@ module CustomFields
     ##
     # Model that represents a single custom field group.
     #
-    # @since  0.1
+    # @since 0.1
+    # @event before_new_custom_field_group
+    # @event after_new_custom_field_group
+    # @event before_edit_custom_field_group
+    # @event after_edit_custom_field_group
+    # @event before_delete_custom_field_group
+    # @event after_delete_custom_field_group
     #
     class CustomFieldGroup < Sequel::Model
       include Zen::Model::Helper
 
+      ##
+      # Array containing the columns that can be set by the user.
+      #
+      # @since 17-02-2012
+      #
+      COLUMNS = [:name, :description]
+
       one_to_many :custom_fields,
         :class => 'CustomFields::Model::CustomField',
         :order => :sort_order
 
       many_to_many :sections, :class => 'Sections::Model::Section'
 
+      plugin :association_dependencies, :custom_fields => :delete
+
+      plugin :events,
+        :before_create  => :before_new_custom_field_group,
+        :after_create   => :after_new_custom_field_group,
+        :before_update  => :before_edit_custom_field_group,
+        :after_update   => :after_edit_custom_field_group,
+        :before_destroy => :before_delete_custom_field_group,
+        :after_destroy  => :after_delete_custom_field_group
+
       ##
       # Searches for a set of custom field groups.
       #
@@ -35,6 +58,17 @@ module CustomFields
         validates_presence(:name)
         validates_max_length(255, :name)
       end
+
+      ##
+      # Hook that is executed before creating or saving an object.
+      #
+      # @since 03-01-2012
+      #
+      def before_save
+        sanitize_fields([:name, :description])
+
+        super
+      end
     end # CustomFieldGroup
   end # Model
 end # CustomFields

data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_method.rb

@@ -7,7 +7,10 @@ module CustomFields
     # @since  0.2.8
     #
     class CustomFieldMethod < Sequel::Model
+      one_to_many :custom_field_types,
+        :class => 'CustomFields::Model::CustomFieldType'
 
+      plugin :association_dependencies, :custom_field_types => :delete
     end # CustomFieldType
   end # Model
 end # CustomFields

data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_type.rb

@@ -4,14 +4,42 @@ module CustomFields
     ##
     # Model for managing custom field types.
     #
-    # @since  0.2.8
+    # @since 0.2.8
+    # @event before_new_custom_field_type
+    # @event after_new_custom_field_type
+    # @event before_edit_custom_field_type
+    # @event after_edit_custom_field_type
+    # @event before_delete_custom_field_type
+    # @event after_delete_custom_field_type
     #
     class CustomFieldType < Sequel::Model
       include Zen::Model::Helper
 
+      ##
+      # Array containing all the columns that can be set by the user.
+      #
+      # @since 17-02-2012
+      #
+      COLUMNS = [
+        :name, :language_string, :html_class, :serialize, :allow_markup,
+        :custom_field_method_id
+      ]
+
       many_to_one :custom_field_method,
         :class => 'CustomFields::Model::CustomFieldMethod'
 
+      one_to_many :custom_fields, :class => 'CustomFields::Model::CustomField'
+
+      plugin :association_dependencies, :custom_fields => :delete
+
+      plugin :events,
+        :before_create  => :before_new_custom_field_type,
+        :after_create   => :after_new_custom_field_type,
+        :before_update  => :before_edit_custom_field_type,
+        :after_update   => :after_edit_custom_field_type,
+        :before_destroy => :before_delete_custom_field_type,
+        :after_destroy  => :after_delete_custom_field_type
+
       ##
       # Searches for a set of custom field types.
       #
@@ -55,6 +83,17 @@ module CustomFields
 
         validates_max_length(255, [:name, :language_string, :html_class])
       end
+
+      ##
+      # Hook that is executed before creating or saving an object.
+      #
+      # @since 03-01-2012
+      #
+      def before_save
+        sanitize_fields([:name, :language_string, :html_class])
+
+        super
+      end
     end # CustomFieldType
   end # Model
 end # CustomFields

data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_value.rb

@@ -19,6 +19,7 @@ module CustomFields
       # @param  [Mixed] value The value to store.
       #
       def value=(val)
+        val  = Zen::Security.sanitize(val)
         type = custom_field.custom_field_type
 
         if !type.nil? and type.serialize == true

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-groups/form.xhtml

@@ -3,33 +3,36 @@
         <h1>#{get_breadcrumbs}</h1>
     </header>
 
-    #{form_for(
-      @field_group,
-      :method => :post,
-      :action => CustomFields::Controller::CustomFieldGroups.r(:save),
-      :id     => :custom_field_group_form
-    ) do |f|
-      f.input_hidden(:id        , @field_group.id)
-      f.input_hidden(:csrf_token, get_csrf_token)
+    <div class="body">
+        #{form_for(
+          @field_group,
+          :method => :post,
+          :action => CustomFields::Controller::CustomFieldGroups.r(:save),
+          :id     => :custom_field_group_form,
+          :'data-autosave-url' => CustomFields::Controller::CustomFieldGroups \
+            .r(:autosave)
+        ) do |f|
+          f.input_hidden(:id        , @field_group.id)
+          f.input_hidden(:csrf_token, get_csrf_token)
 
-      f.input_text(
-        lang('custom_field_groups.labels.name'),
-        :name,
-        :required  => :required,
-        :maxlength => 255
-      )
+          f.input_text(
+            lang('custom_field_groups.labels.name'),
+            :name,
+            :required  => :required,
+            :maxlength => 255
+          )
 
-      f.textarea(
-        lang('custom_field_groups.labels.description'),
-        :description,
-        :rows => 8
-      )
+          f.textarea(
+            lang('custom_field_groups.labels.description'),
+            :description,
+            :rows => 8
+          )
 
-      f.g.div(:class => 'button') do
-        f.g.input(
-          :type  => 'submit',
-          :value => lang('custom_field_groups.buttons.save')
-        )
-      end
-    end}
+          f.g.input(
+            :type  => 'submit',
+            :value => lang('custom_field_groups.buttons.save'),
+            :class => 'button'
+          )
+        end}
+    </div>
 </section>

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-groups/index.xhtml

@@ -1,112 +1,108 @@
 <section>
-    #{render_search_form(
-      ::CustomFields::Controller::CustomFieldGroups.r(:index)
-    )}
-
-    <header>
+    <header class="with_search">
         <h1>#{get_breadcrumbs}</h1>
-    </header>
-
-    <form method="post"
-    action="#{CustomFields::Controller::CustomFieldGroups.r(:delete)}">
-        <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
 
-        <?r if !@field_groups.empty? ?>
-
-        <table>
-            <thead>
-                <tr>
-                    <?r if user_authorized?(:delete_custom_field_group) ?>
-                    <th class="no_sort">
-                        <input type="checkbox" />
-                    </th>
-                    <?r end ?>
-
-                    <th>#{lang('custom_field_groups.labels.id')}</th>
-                    <th>#{lang('custom_field_groups.labels.name')}</th>
-                    <th>#{lang('custom_field_groups.labels.sections')}</th>
-
-                    <?r if user_authorized?(:show_custom_field) ?>
-                    <th></th>
-                    <?r end ?>
-                </tr>
-            </thead>
-            <tbody>
-                <?r @field_groups.each do |group| ?>
-                <tr>
-                    <?r if user_authorized?(:delete) ?>
-                    <td>
-                        <input type="checkbox" name="custom_field_group_ids[]"
-                        value="#{group.id}" />
-                    </td>
-                    <?r end ?>
-
-                    <td>#{group.id}</td>
-
-                    <?r if user_authorized?(:edit_custom_field_group) ?>
-
-                    <td>
-                        #{CustomFields::Controller::CustomFieldGroups.a(
-                          group.name, :edit, group.id
-                        )}
-                    </td>
-
-                    <?r else ?>
-
-                    <td>#{group.name}</td>
-
-                    <?r end ?>
+        #{render_search_form(
+          CustomFields::Controller::CustomFieldGroups.r(:index)
+        )}
+    </header>
 
-                    <td>
-                        #{sections = group.sections.map { |s| s.name }
-
-                        if sections.empty?
-                          lang('custom_field_groups.labels.none')
-                        else
-                          sections.join(', ')
-                        end}
-                    </td>
-
-                    <?r if user_authorized?(:show_custom_field) ?>
-                    <td>
-                        #{CustomFields::Controller::CustomFields.a(
-                          lang('custom_field_groups.labels.manage_fields'),
-                          :index,
-                          group.id
-                        )}
-                    </td>
+    <div class="body">
+        <form method="post"
+        action="#{CustomFields::Controller::CustomFieldGroups.r(:delete)}">
+            <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
+
+            <?r if !@field_groups.empty? ?>
+
+            <table>
+                <thead>
+                    <tr>
+                        <?r if user_authorized?(:delete_custom_field_group) ?>
+                        <th class="no_sort">
+                            <input type="checkbox" />
+                        </th>
+                        <?r end ?>
+
+                        <th>#{lang('custom_field_groups.labels.id')}</th>
+                        <th>#{lang('custom_field_groups.labels.name')}</th>
+                        <th>#{lang('custom_field_groups.labels.sections')}</th>
+
+                        <?r if user_authorized?(:show_custom_field) ?>
+                        <th></th>
+                        <?r end ?>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?r @field_groups.each do |group| ?>
+                    <tr>
+                        <?r if user_authorized?(:delete) ?>
+                        <td>
+                            <input type="checkbox" name="custom_field_group_ids[]"
+                            value="#{group.id}" />
+                        </td>
+                        <?r end ?>
+
+                        <td>#{group.id}</td>
+
+                        <td>
+                            #{if user_authorized?(:edit_custom_field_group)
+                              edit_link(
+                                CustomFields::Controller::CustomFieldGroups.r(
+                                  :edit,
+                                  group.id
+                                ),
+                                group.name
+                              )
+                            else
+                              group.name
+                            end}
+                        </td>
+
+                        <td>
+                            #{sections = group.sections.map { |s| s.name }
+
+                            if sections.empty?
+                              lang('custom_field_groups.labels.none')
+                            else
+                              sections.join(', ')
+                            end}
+                        </td>
+
+                        <?r if user_authorized?(:show_custom_field) ?>
+                        <td>
+                            #{manage_link(
+                              CustomFields::Controller::CustomFields.r(
+                                :index,
+                                group.id
+                              ),
+                              lang('custom_field_groups.labels.manage_fields')
+                            )}
+                        </td>
+                        <?r end ?>
+                    </tr>
                     <?r end ?>
-                </tr>
-                <?r end ?>
-            </tbody>
-        </table>
+                </tbody>
+            </table>
 
-        #{if @field_groups.respond_to?(:navigation) \
-        and @field_groups.page_count > 1
-          @field_groups.navigation
-        end}
+            #{render_pagination(@field_groups)}
 
-        <?r else ?>
+            <?r else ?>
 
-        <p>#{lang('custom_field_groups.messages.no_groups')}</p>
+            <p>#{lang('custom_field_groups.messages.no_groups')}</p>
 
-        <?r end ?>
+            <?r end ?>
 
-        <?r if user_authorized?(:new_custom_field_group) ?>
-        <div class="button">
-            #{CustomFields::Controller::CustomFieldGroups.a(
-              lang('custom_field_groups.buttons.new'),
-              :new
+            <?r if user_authorized?(:new_custom_field_group) ?>
+            #{new_button(
+              CustomFields::Controller::CustomFieldGroups.r(:new),
+              lang('custom_field_groups.buttons.new')
             )}
-        </div>
-        <?r end ?>
-
-        <?r if user_authorized?(:delete_custom_field_group) \
-        and !@field_groups.empty? ?>
-        <div class="button">
-            <input type="submit"
-            value="#{lang('custom_field_groups.buttons.delete')}" />
-        </div>
-        <?r end ?>
-    </form>
+            <?r end ?>
+
+            <?r if user_authorized?(:delete_custom_field_group) \
+            and !@field_groups.empty? ?>
+            #{delete_button(lang('custom_field_groups.buttons.delete'))}
+            <?r end ?>
+        </form>
+    </div>
 </section>

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-types/form.xhtml

@@ -3,64 +3,67 @@
         <h1>#{get_breadcrumbs}</h1>
     </header>
 
-    #{form_for(
-      @custom_field_type,
-      :method => :post,
-      :id     => :custom_field_type_form,
-      :action => CustomFields::Controller::CustomFieldTypes.r(:save)
-    ) do |f|
-      f.input_hidden(:csrf_token, get_csrf_token)
-      f.input_hidden(:id        , @custom_field_type.id)
+    <div class="body">
+        #{form_for(
+          @custom_field_type,
+          :method => :post,
+          :id     => :custom_field_type_form,
+          :action => CustomFields::Controller::CustomFieldTypes.r(:save),
+          :'data-autosave-url' => CustomFields::Controller::CustomFieldTypes \
+            .r(:autosave)
+        ) do |f|
+          f.input_hidden(:csrf_token, get_csrf_token)
+          f.input_hidden(:id        , @custom_field_type.id)
 
-      f.input_text(
-        lang('custom_field_types.labels.name'),
-        :name,
-        :required  => :required,
-        :maxlength => 255
-      )
+          f.input_text(
+            lang('custom_field_types.labels.name'),
+            :name,
+            :required  => :required,
+            :maxlength => 255
+          )
 
-      f.input_text(
-        lang('custom_field_types.labels.language_string'),
-        :language_string,
-        :required  => :required,
-        :maxlength => 255
-      )
+          f.input_text(
+            lang('custom_field_types.labels.language_string'),
+            :language_string,
+            :required  => :required,
+            :maxlength => 255
+          )
 
-      f.input_text(
-        lang('custom_field_types.labels.html_class'),
-        :html_class,
-        :maxlength => 255,
-        :pattern   => '^[a-zA-Z\\\-_0-9\\\s]*$'
-      )
+          f.input_text(
+            lang('custom_field_types.labels.html_class'),
+            :html_class,
+            :maxlength => 255,
+            :pattern   => '^[a-zA-Z\\\-_0-9\\\s]*$'
+          )
 
-      f.input_radio(
-        lang('custom_field_types.labels.serialize'),
-        :serialize,
-        @custom_field_type.serialize,
-        :values => @boolean_hash.invert
-      )
+          f.input_radio(
+            lang('custom_field_types.labels.serialize'),
+            :serialize,
+            @custom_field_type.serialize,
+            :values => @boolean_hash.invert
+          )
 
-      f.input_radio(
-        lang('custom_field_types.labels.allow_markup'),
-        :allow_markup,
-        @custom_field_type.allow_markup,
-        :values => @boolean_hash.invert
-      )
+          f.input_radio(
+            lang('custom_field_types.labels.allow_markup'),
+            :allow_markup,
+            @custom_field_type.allow_markup,
+            :values => @boolean_hash.invert
+          )
 
-      f.select(
-        lang('custom_field_types.labels.custom_field_method_id'),
-        :custom_field_method_id,
-        :values   => @custom_field_methods,
-        :size     => 1,
-        :selected => @custom_field_type.custom_field_method_id,
-        :required => :required
-      )
+          f.select(
+            lang('custom_field_types.labels.custom_field_method_id'),
+            :custom_field_method_id,
+            :values   => @custom_field_methods,
+            :size     => 1,
+            :selected => @custom_field_type.custom_field_method_id,
+            :required => :required
+          )
 
-      f.g.div(:class => 'button') do
-        f.g.input(
-          :type  => :submit,
-          :value => lang('custom_field_types.buttons.save')
-        )
-      end
-    end}
+          f.g.input(
+            :type  => :submit,
+            :value => lang('custom_field_types.buttons.save'),
+            :class => 'button'
+          )
+        end}
+    </div>
 </section>