zen 0.2.7 → 0.2.8

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

@@ -0,0 +1,50 @@
+#:nodoc:
+module CustomFields
+  #:nodoc:
+  module Model
+    ##
+    # Model for managing custom field types.
+    #
+    # @author Yorick Peterse
+    # @since  0.2.8
+    #
+    class CustomFieldType < Sequel::Model
+      many_to_one(
+        :custom_field_method, 
+        :class => 'CustomFields::Model::CustomFieldMethod'
+      )
+
+      ##
+      # Returns a hash where the keys are the IDs of all custom field types and
+      # the values the full language strings based on the value of the column
+      # "language_string".
+      #
+      # @author Yorick Peterse
+      # @since  0.2.8
+      # @return [Hash]
+      #
+      def self.type_hash
+        rows = {}
+        
+        CustomFieldType.select(:id, :language_string).each do |row|
+          rows[row.id] = lang(row.language_string)
+        end
+
+        return rows
+      end
+
+      ##
+      # Validates the model before inserting/updating the database record.
+      #
+      # @author Yorick Peterse
+      # @since  0.2.8
+      #
+      def validate
+        validates_presence([:name, :language_string, :custom_field_method_id])
+        validates_integer(:custom_field_method_id)
+        validates_type(TrueClass, [:serialize, :allow_markup])
+        validates_format(/^[a-zA-Z\-_0-9]*/, [:html_class])
+      end
+    end # CustomFieldType
+  end # Model
+end # CustomFields

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

@@ -19,17 +19,38 @@ module CustomFields
       many_to_one(:section_entry, :class => "Sections::Model::SectionEntry")
 
       ##
-      # Hook that is executed before saving a field's value. This hook is used to clean
-      # up all values making it easier to process them at a later stage.
+      # Sets the value and serializes it based on the field type.
       #
       # @author Yorick Peterse
-      # @since  0.2.4
+      # @since  0.2.8
+      # @param  [Mixed] value The value to store.
       #
-      def before_save
-        # T-t-t-t-that's all folks!
-        if !self.value.nil?
-          self.value.gsub!(/\r\n/, "\n")
+      def value=(val)
+        type = custom_field.custom_field_type
+
+        if !type.nil? and type.serialize === true
+          val = [Marshal.dump(val)].pack('m')
         end
+
+        super(val)
+      end
+
+      ##
+      # Retrieves the value and optionally unserializes it.
+      #
+      # @author Yorick Peterse
+      # @since  0.2.8
+      # @return [Mixed]
+      #
+      def value
+        val  = super
+        type = custom_field.custom_field_type
+
+        if !type.nil? and type.serialize === true
+          val = Marshal.load(val.unpack('m')[0]) rescue Marshal.load(val)
+        end
+
+        return val
       end
     end # CustomFieldValue
   end # Model

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

@@ -1,30 +1,35 @@
-#{
-form_for(
-  @field_group, :method => :post, :action => @form_save_url, 
-  :id => :custom_field_group_form
-) do |f|
-
-  f.input_hidden(:id, @field_group.id)
-  f.input_hidden(:csrf_token, get_csrf_token)
-  
-  f.g.div(:id => 'general') do
-    f.input_text(
-      lang('custom_field_groups.labels.name'), 
-      :name
-    )
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
     
-    f.textarea(
-      lang('custom_field_groups.labels.description'), 
-      :description, 
-      :rows => 8
-    )
-  end
-  
-  f.g.div(:class => 'clearfix') do
-    f.g.div(:class => 'button') do
-      f.g.input(:type => 'submit', :value => lang('custom_field_groups.buttons.save'))
+    #{
+    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)
+      
+      f.input_text(
+        lang('custom_field_groups.labels.name'), 
+        :name
+      )
+        
+      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
-  end
-
-end
-}
+    }
+</article>

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

@@ -2,25 +2,26 @@
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
-    
-    <form method="post" action="#{@form_delete_url}">
+
+    <form method="post"
+    action="#{CustomFields::Controller::CustomFieldGroups.r(:delete)}">
         <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
-        
+
         <?r if @field_groups and !@field_groups.empty? ?>
-        
-        <table class="table">
+
+        <table>
             <thead>
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
-                    <th>
+                    <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?(
                       [:read], true, 'CustomFields::Controller::CustomFields'
                     ) ?>
@@ -33,72 +34,73 @@
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
                     <td>
-                        <input type="checkbox" name="custom_field_group_ids[]" value="#{group.id}" />
+                        <input type="checkbox" name="custom_field_group_ids[]"
+                        value="#{group.id}" />
                     </td>
                     <?r end ?>
-                    
+
                     <td>#{group.id}</td>
-                    
+
                     <?r if user_authorized?([:update]) ?>
                     <td>
-                        #{anchor_to(
-                          group.name, 
-                          CustomFields::Controller::CustomFieldGroups.r(:edit, group.id), 
-                          :title => group.name
+                        #{CustomFields::Controller::CustomFieldGroups.a(
+                          group.name, :edit, group.id
                         )}
                     </td>
                     <?r else ?>
                     <td>#{group.name}</td>
                     <?r end ?>
-                    
+
                     <td>
-                        <?r sections = group.sections.map { |s| s.name } ?> 
+                        <?r sections = group.sections.map { |s| s.name } ?>
                         <?r if !sections.empty? ?>
-                            #{sections.join(', ')}
+                        #{sections.join(', ')}
                         <?r else ?>
-                            #{lang('custom_field_groups.labels.none')}
-                        <?r end ?> 
+                        #{lang('custom_field_groups.labels.none')}
+                        <?r end ?>
                     </td>
-                    
+
                     <?r if user_authorized?(
                       [:read], true, 'CustomFields::Controller::CustomFields'
                     ) ?>
                     <td>
-                      #{anchor_to(
-                          lang('custom_field_groups.labels.manage_fields'), 
-                          CustomFields::Controller::CustomFields.r(:index, group.id) 
+                        #{CustomFields::Controller::CustomFields.a(
+                          lang('custom_field_groups.labels.manage_fields'),
+                          :index,
+                          group.id
                         )}
                     </td>
                     <?r end ?>
-                    
                 </tr>
                 <?r end ?>
             </tbody>
         </table>
-        
+
+        #{
+        if @field_groups.respond_to?(:navigation) \
+        and @field_groups.page_count > 1
+          @field_groups.navigation
+        end
+        }
+
         <?r else ?>
-        
         <p>#{lang('custom_field_groups.messages.no_groups')}</p>
-        
         <?r end ?>
-        
-        <div class="clearfix">
-            
-            <?r if user_authorized?([:create]) ?>
-            <div class="button">
-                #{anchor_to(
-                  lang('custom_field_groups.buttons.new'), 
-                  CustomFields::Controller::CustomFieldGroups.r(:new)
-                )}
-            </div>
-            <?r end ?>
-            
-            <?r if user_authorized?([:delete]) and @field_groups and !@field_groups.empty? ?>
-            <div class="button">
-                <input type="submit" value="#{lang('custom_field_groups.buttons.delete')}" />
-            </div>
-            <?r end ?>
+
+        <?r if user_authorized?([:create]) ?>
+        <div class="button">
+            #{CustomFields::Controller::CustomFieldGroups.a(
+              lang('custom_field_groups.buttons.new'),
+              :new
+            )}
         </div>
+        <?r end ?>
 
+        <?r if user_authorized?([:delete]) and !@field_groups.empty? ?>
+        <div class="button">
+            <input type="submit"
+            value="#{lang('custom_field_groups.buttons.delete')}" />
+        </div>
+        <?r end ?>
     </form>
-</article> 
+</article>

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

@@ -0,0 +1,61 @@
+<article>
+    <header>
+        <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)
+
+      f.input_text(
+        lang('custom_field_types.labels.name'),
+        :name
+      )
+
+      f.input_text(
+        lang('custom_field_types.labels.language_string'),
+        :language_string
+      )
+
+      f.input_text(
+        lang('custom_field_types.labels.html_class'),
+        :html_class
+      )
+
+      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.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
+      )
+
+      f.g.div(:class => 'button') do
+        f.g.input(
+          :type  => :submit,
+          :value => lang('custom_field_types.buttons.save')
+        )
+      end
+    end
+    }
+</article>

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

@@ -0,0 +1,93 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+
+    <form action="#{CustomFields::Controller::CustomFieldTypes.r(:delete)}"
+    method="post">
+        <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
+
+        <?r if !@field_types.empty? ?>
+
+        <table>
+            <thead>
+                <tr>
+                    <?r if user_authorized?([:delete]) ?>
+                    <th class="no_sort">
+                        <input type="checkbox" />
+                    </th>
+                    <?r end ?>
+
+                    <th>#{lang('custom_field_types.labels.id')}</th>
+                    <th>#{lang('custom_field_types.labels.name')}</th>
+                    <th>#{lang('custom_field_types.labels.language_string')}</th>
+                    <th>#{lang('custom_field_types.labels.html_class')}</th>
+                    <th>#{lang('custom_field_types.labels.serialize')}</th>
+                    <th>#{lang('custom_field_types.labels.allow_markup')}</th>
+                    <th>
+                        #{lang(
+                          'custom_field_types.labels.custom_field_method_id'
+                        )}
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <?r @field_types.each do |type| ?>
+                <tr>
+                    <?r if user_authorized?([:delete]) ?>
+                    <td>
+                        <input type="checkbox" name="custom_field_type_ids[]"
+                        id="custom_field_type_#{type.id}" value="#{type.id}" />
+                    </td>
+                    <?r end ?>
+
+                    <td>#{type.id}</td>
+                    <td>
+                        <?r if user_authorized?([:update]) ?>
+                        #{CustomFields::Controller::CustomFieldTypes.a(
+                          type.name,
+                          :edit,
+                          type.id
+                        )}
+                        <?r else ?>
+                        #{type.name}
+                        <?r end ?>
+                    </td>
+                    <td>#{type.language_string}</td>
+                    <td>#{type.html_class}</td>
+                    <td>#{@boolean_hash[type.serialize]}</td>
+                    <td>#{@boolean_hash[type.allow_markup]}</td>
+                    <td>#{type.custom_field_method.name}</td>
+                </tr>
+                <?r end ?>
+            </tbody>
+        </table>
+
+        #{
+        if @field_types.respond_to?(:navigation) \
+        and @field_types.page_count > 1
+          @field_types.navigation
+        end
+        }
+
+        <?r else ?>
+        <p>#{lang('custom_field_types.messages.no_field_types')}</p>
+        <?r end ?>
+
+        <?r if user_authorized?([:create]) ?>
+        <div class="button">
+            #{CustomFields::Controller::CustomFieldTypes.a(
+              lang('custom_field_types.buttons.new'),
+              :new
+            )}
+        </div>
+        <?r end ?>
+
+        <?r if user_authorized?([:delete]) and !@field_types.empty? ?>
+        <div class="button">
+            <input type="submit"
+            value="#{lang('custom_field_types.buttons.delete')}" />
+        </div>
+        <?r end ?>
+    </form>
+</article>