inline_forms 1.3.6 → 1.3.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    inline_forms (1.2.2)
+    inline_forms (1.3.6)
 
 GEM
   remote: http://rubygems.org/

data/bin/inline_forms

@@ -84,6 +84,7 @@ gem 'inline_forms'
 gem 'mini_magick'
 gem 'jquery_datepicker'
 gem 'yaml_db'
+gem 'rails-i18n'
 
 "
 gemfile_development_group ="
@@ -174,7 +175,7 @@ header_src = "
   </div>
   <% if cancan_enabled? -%>
   <div id='logout'>
-    <%= link_to 'Afmelden: \#{current_user.name}', destroy_user_session_path %>
+    <%= link_to 'Afmelden: \#{current_user.name}', destroy_user_session_path, :method => :delete %>
   </div>
   <% end -%>
   <div style='clear: both;'></div>

data/lib/app/assets/stylesheets/inline_forms.css

@@ -188,18 +188,51 @@ ul.checklist li {
     margin: 0.4em 0 0.3em 0;
 }
 
+/* HEADER */
+
 #title {
     float: left;
+    height: 1.5em;
 }
 
 #logout {
     float:right;
+    height: 1.5em;
+}
+
+#locales {
+    float: left;
+    height: 1.5em;
+    margin-left: 2em;
+}
+
+#locales ul {
+    list-style: none;
+    list-style-position: inside;
+    margin: 0;
+    padding: 0;
+}
+
+#locales li {
+    display: inline-block;
+    height: 1.5em;
+}
+
+#locales li a {
+    color: white;
+}
+
+#locales li .active_locale {
+    color: yellow;
 }
 
 #logout a {
     color: white;
 }
 
+/* END HEADER */
+
+
 #tabs {
     background-color: #F9EBAE;
     -moz-border-radius: 5px;
@@ -359,3 +392,4 @@ ul.checklist li {
     text-align: right;
     font-family: monospace;
 }
+

data/lib/app/controllers/inline_forms_application_controller.rb

@@ -0,0 +1,21 @@
+class InlineFormsApplicationController < ActionController::Base
+  protect_from_forgery
+  layout 'devise' if :devise_controller?
+  
+  # limit available locales by setting this. Override in applicaton_controller.
+  I18n.available_locales = [ :en, :nl, :pp ]
+
+  #set the locale based on the subdomain
+  def set_locale
+    I18n.locale = extract_locale_from_subdomain || I18n.default_locale
+
+  end
+
+  # Get locale code from request subdomain (like http://it.application.local:3000)
+  def extract_locale_from_subdomain
+    locale = request.subdomains.first
+    return nil if locale.nil?
+    I18n.available_locales.include?(locale.to_sym) ? locale.to_s : nil
+  end
+
+end

data/lib/app/controllers/inline_forms_controller.rb

@@ -1,223 +1,256 @@
-  # == Generic controller for the inline_forms plugin.
-  # === Usage
-  # If you have an Example class, make an ExampleController
-  # that is a subclass of InlineFormsController
-  #  class ExampleController < InlineFormsController
-  #  end
-  # That's it! It'll work. But please read about the InlineForms::InlineFormsGenerator first!
-  #
-  # You can override the methods in your ExampleController
-  #  def index
-  #    @objects=@Klass.all
-  #  end
-  #
-  #
-  # @objects holds the objects (in this case Examples)
-  # and @Klass will be set to Example by the getKlass before filter.
-  #
-  # === How it works
-  # The getKlass before_filter extracts the class and puts it in @Klass
-  #
-  # @Klass is used in the InlineFormsHelper
-  #
-  class InlineFormsController < ApplicationController
-    before_filter :getKlass
-
-    def self.cancan_enabled?
-      begin
-        ::Ability && true
-      rescue NameError
-        false
-      end
-    end
+# == Generic controller for the inline_forms plugin.
+# === Usage
+# If you have an Example class, make an ExampleController
+# that is a subclass of InlineFormsController
+#  class ExampleController < InlineFormsController
+#  end
+# That's it! It'll work. But please read about the InlineForms::InlineFormsGenerator first!
+#
+# You can override the methods in your ExampleController
+#  def index
+#    @objects=@Klass.all
+#  end
+#
+#
+# @objects holds the objects (in this case Examples)
+# and @Klass will be set to Example by the getKlass before filter.
+#
+# === How it works
+# The getKlass before_filter extracts the class and puts it in @Klass
+#
+# @Klass is used in the InlineFormsHelper
+#
+class InlineFormsController < ApplicationController
+  before_filter :getKlass
 
-    def cancan_enabled?
-      self.class.cancan_enabled?
+  def self.cancan_enabled?
+    begin
+      ::Ability && true
+    rescue NameError
+      false
     end
+  end
 
-    def cancan_disabled?
-      ! self.class.cancan_enabled?
-    end
+  def cancan_enabled?
+    self.class.cancan_enabled?
+  end
+
+  def cancan_disabled?
+    ! self.class.cancan_enabled?
+  end
+
+  helper_method :cancan_disabled?, :cancan_enabled?
 
-    helper_method :cancan_disabled?, :cancan_enabled?
+  load_and_authorize_resource if cancan_enabled?
 
-    load_and_authorize_resource if cancan_enabled?
+  # :index shows a list of all objects from class @Klass, using will_paginate,
+  # including a link to 'new', that allows you to create a new record.
+  def index
+    @update_span = params[:update]
+    @parent_class = params[:parent_class]
+    @parent_id = params[:parent_id]
+    @ul_needed = params[:ul_needed]
+    @PER_PAGE = 5 unless @parent_class.nil?
+    # if the parent_class is not nill, we are in associated list and we don't search there.
+    # also, make sure the Model that you want to do a search on has a :name attribute. TODO
+    if @parent_class.nil?
+      conditions = [ @Klass.order_by_clause.to_s + " like ?", "%#{params[:search]}%" ]
+    else
+      conditions =  [ "#{@parent_class.foreign_key} = ?", @parent_id ]
+    end
+    # if we are using cancan, then make sure to select only accessible records
+    if cancan_enabled?
+      @objects = @Klass.accessible_by(current_ability).order(@Klass.order_by_clause).paginate(
+        :page => params[:page],
+        :per_page => @PER_PAGE || 12,
+        :conditions => conditions )
+    else
+      @objects = @Klass.order(@Klass.order_by_clause).paginate(
+        :page => params[:page],
+        :per_page => @PER_PAGE || 12,
+        :conditions => conditions )
+    end
+    respond_to do |format|
+      format.html { render 'inline_forms/_list', :layout => 'inline_forms' } unless @Klass.not_accessible_through_html?
+      format.js { render :list }
+    end
+  end
 
-    # :index shows a list of all objects from class @Klass, using will_paginate,
-    # including a link to 'new', that allows you to create a new record.
-    def index
-      @update_span = params[:update]
-      @parent_class = params[:parent_class]
+  # :new prepares a new object, updates the list of objects and replaces it with
+  # an empty form. After pressing OK or Cancel, the list of objects is retrieved
+  # in the same way as :index
+  def new
+    @object = @Klass.new
+    @update_span = params[:update]
+    @parent_class = params[:parent_class]
+    unless @parent_class.nil?
       @parent_id = params[:parent_id]
-      @ul_needed = params[:ul_needed]
-      @PER_PAGE = 5 unless @parent_class.nil?
-      # if the parent_class is not nill, we are in associated list and we don't search there.
-      # also, make sure the Model that you want to do a search on has a :name attribute. TODO
-      if @parent_class.nil?
-        conditions = [ @Klass.order_by_clause.to_s + " like ?", "%#{params[:search]}%" ]
-      else
-        conditions =  [ "#{@parent_class.foreign_key} = ?", @parent_id ]
-      end
-      # if we are using cancan, then make sure to select only accessible records
+      @object[@parent_class.foreign_key] = @parent_id
+    end
+    @object.inline_forms_attribute_list = @inline_forms_attribute_list if @inline_forms_attribute_list
+    respond_to do |format|
+      format.js { }
+    end
+  end
+
+  # :edit presents a form to edit one specific attribute from an object
+  def edit
+    @object = @Klass.find(params[:id])
+    @attribute = params[:attribute]
+    @form_element = params[:form_element]
+    @sub_id = params[:sub_id]
+    @update_span = params[:update]
+    respond_to do |format|
+      #format.html { } unless @Klass.not_accessible_through_html?
+      format.js { }
+    end
+  end
+
+  # :create creates the object made with :new.
+  # It then presents the list of objects.
+  def create
+    object = @Klass.new
+    @update_span = params[:update]
+    attributes = @inline_forms_attribute_list || object.inline_forms_attribute_list
+    attributes.each do | attribute, name, form_element |
+      send("#{form_element.to_s}_update", object, attribute) unless form_element == :associated
+    end
+    @parent_class = params[:parent_class]
+    @parent_id = params[:parent_id]
+    @PER_PAGE = 5 unless @parent_class.nil?
+    # for the logic behind the :conditions see the #index method.
+    @parent_class.nil? ? conditions = [ @Klass.order_by_clause.to_s + " like ?", "%#{params[:search]}%" ] : conditions =  [ "#{@parent_class.foreign_key} = ?", @parent_id ]
+    object[@parent_class.foreign_key] = @parent_id unless @parent_class.nil?
+    puts "BEFORE IF #{object.id} #{object.name}"
+    if object.save
+    puts "AFTER SAVE IF #{object.id} #{object.name}"
+      flash.now[:success] = t('success', :message => object.class.model_name.human)
       if cancan_enabled?
-        @objects = @Klass.accessible_by(current_ability).order(@Klass.order_by_clause).paginate(
-          :page => params[:page],
-          :per_page => @PER_PAGE || 12,
-          :conditions => conditions )
+        @objects = @Klass.accessible_by(current_ability).order(@Klass.order_by_clause).paginate :page => params[:page], :per_page => @PER_PAGE || 12, :conditions => conditions
       else
-        @objects = @Klass.order(@Klass.order_by_clause).paginate(
-          :page => params[:page],
-          :per_page => @PER_PAGE || 12,
-          :conditions => conditions )
+        @objects = @Klass.order(@Klass.order_by_clause).paginate :page => params[:page], :per_page => @PER_PAGE || 12, :conditions => conditions
       end
       respond_to do |format|
-        format.html { render 'inline_forms/_list', :layout => 'inline_forms' } unless @Klass.not_accessible_through_html?
-        format.js { render :list }
-      end
-    end
-
-    # :new prepares a new object, updates the list of objects and replaces it with
-    # an empty form. After pressing OK or Cancel, the list of objects is retrieved
-    # in the same way as :index
-    def new
-      @object = @Klass.new
-      @update_span = params[:update]
-      @parent_class = params[:parent_class]
-      unless @parent_class.nil?
-        @parent_id = params[:parent_id]
-        @object[@parent_class.foreign_key] = @parent_id
+        format.js { render :list}
       end
-      @object.inline_forms_attribute_list = @inline_forms_attribute_list if @inline_forms_attribute_list
+      puts "*)*)*)#{object.id} #{object.name}"
+    else
+      flash.now[:header] = ["Kan #{object.class.to_s.underscore} niet aanmaken."]
+      flash.now[:error] = object.errors.to_a
       respond_to do |format|
-        format.js { }
+        @object = object
+        @object.inline_forms_attribute_list = attributes
+        format.js { render :new}
       end
     end
+  end
 
-    # :edit presents a form to edit one specific attribute from an object
-    def edit
-      @object = @Klass.find(params[:id])
-      @attribute = params[:attribute]
-      @form_element = params[:form_element]
-      @sub_id = params[:sub_id]
-      @update_span = params[:update]
-      respond_to do |format|
-        #format.html { } unless @Klass.not_accessible_through_html?
-        format.js { }
-      end
+  # :update updates a specific attribute from an object.
+  def update
+    @object = @Klass.find(params[:id])
+    @attribute = params[:attribute]
+    @form_element = params[:form_element]
+    @sub_id = params[:sub_id]
+    @update_span = params[:update]
+    send("#{@form_element.to_s}_update", @object, @attribute)
+    @object.save
+    #puts "Requested #{request.format}"
+    respond_to do |format|
+      format.js { }
     end
+  end
 
-    # :create creates the object made with :new.
-    # It then presents the list of objects.
-    def create
-      object = @Klass.new
-      @update_span = params[:update]
-      attributes = @inline_forms_attribute_list || object.inline_forms_attribute_list
-      attributes.each do | attribute, name, form_element |
-        send("#{form_element.to_s}_update", object, attribute) unless form_element == :associated
+  # :show shows one attribute (attribute) from a record (object).
+  # It includes the link to 'edit'
+  def show
+    @object = @Klass.find(params[:id])
+    @attribute = params[:attribute]
+    @form_element = params[:form_element]
+    close = params[:close] || false
+    if @form_element == "associated"
+      @sub_id = params[:sub_id]
+      if @sub_id.to_i > 0
+        @associated_record_id = @object.send(@attribute.to_s.singularize + "_ids").index(@sub_id.to_i)
+        @associated_record = @object.send(@attribute)[@associated_record_id]
       end
-      @parent_class = params[:parent_class]
-      @parent_id = params[:parent_id]
-      @PER_PAGE = 5 unless @parent_class.nil?
-      # for the logic behind the :conditions see the #index method.
-      @parent_class.nil? ? conditions = [ @Klass.order_by_clause.to_s + " like ?", "%#{params[:search]}%" ] : conditions =  [ "#{@parent_class.foreign_key} = ?", @parent_id ]
-      object[@parent_class.foreign_key] = @parent_id unless @parent_class.nil?
-      if object.save
-        flash.now[:success] = "Successfully created #{object.class.to_s.underscore}."
-        if cancan_enabled?
-          @objects = @Klass.accessible_by(current_ability).order(@Klass.order_by_clause).paginate :page => params[:page], :per_page => @PER_PAGE || 12, :conditions => conditions
+    end
+    @update_span = params[:update]
+    if @attribute.nil?
+      respond_to do |format|
+        @attributes = @object.inline_forms_attribute_list
+        if close
+          format.js { render :close }
         else
-          @objects = @Klass.order(@Klass.order_by_clause).paginate :page => params[:page], :per_page => @PER_PAGE || 12, :conditions => conditions
-        end
-        respond_to do |format|
-          format.js { render :list }
-        end
-      else
-        flash.now[:error] = "Kan #{object.class.to_s.underscore} niet aanmaken.".html_safe
-        object.errors.each do |e|
-          flash.now[:error] << '<br />'.html_safe + e[0].to_s + ": " + e[1]
-        end
-        respond_to do |format|
-          @object = object
-          @object.inline_forms_attribute_list = attributes
-          format.js { render :new}
+          format.js { }
         end
       end
-    end
-
-    # :update updates a specific attribute from an object.
-    def update
-      @object = @Klass.find(params[:id])
-      @attribute = params[:attribute]
-      @form_element = params[:form_element]
-      @sub_id = params[:sub_id]
-      @update_span = params[:update]
-      send("#{@form_element.to_s}_update", @object, @attribute)
-      @object.save
-      #puts "Requested #{request.format}"
+    else
       respond_to do |format|
-        format.js { }
+        format.js { render :show_element }
       end
     end
+  end
 
-    # :show shows one attribute (attribute) from a record (object).
-    # It includes the link to 'edit'
-    def show
-      @object = @Klass.find(params[:id])
-      @attribute = params[:attribute]
-      @form_element = params[:form_element]
-      close = params[:close] || false
-      if @form_element == "associated"
-        @sub_id = params[:sub_id]
-        if @sub_id.to_i > 0
-          @associated_record_id = @object.send(@attribute.to_s.singularize + "_ids").index(@sub_id.to_i)
-          @associated_record = @object.send(@attribute)[@associated_record_id]
-        end
-      end
-      @update_span = params[:update]
-      if @attribute.nil?
-        respond_to do |format|
-          @attributes = @object.inline_forms_attribute_list
-          if close
-            format.js { render :close }
-          else
-            format.js { }
-          end
-        end
-      else
-        respond_to do |format|
-          format.js { render :show_element }
-        end
-      end
+  # :destroy destroys the record, but also shows an undo link (with paper_trail)
+  def destroy
+    @update_span = params[:update]
+    @object = @Klass.find(params[:id])
+    @object.destroy
+    respond_to do |format|
+      format.js { render :show_undo }
     end
+  end
 
-    # :destroy destroys the record, but also shows an undo link (with paper_trail)
-    def destroy
-      @update_span = params[:update]
-      @object = @Klass.find(params[:id])
-      @object.destroy
-      respond_to do |format|
-        format.js { render :show_undo }
-      end
+  # :revert works like undo.
+  # Thanks Ryan Bates: http://railscasts.com/episodes/255-undo-with-paper-trail
+  def revert
+    @update_span = params[:update]
+    @version = Version.find(params[:id])
+    @version.reify.save!
+    @object = @Klass.find(@version.item_id)
+    respond_to do |format|
+      format.js { render :close }
     end
+  end
 
-    # :revert works like undo.
-    # Thanks Ryan Bates: http://railscasts.com/episodes/255-undo-with-paper-trail
-    def revert
-      @update_span = params[:update]
-      @version = Version.find(params[:id])
-      @version.reify.save!
-      @object = @Klass.find(@version.item_id)
-      respond_to do |format|
-        format.js { render :close }
-      end
+  def extract_translations
+    keys_array = []
+    I18n::Backend::ActiveRecord::Translation.order(:locale, :thekey).each do |t|
+      keys_array << deep_hashify([ t.locale, t.thekey.split('.'), t.value ].flatten)
     end
-
-    private
-    # Get the class from the controller name.
-    # CountryController < InlineFormsController, so what class are we?
-    # TODO think about this a bit more.
-    def getKlass #:doc:
-      @Klass = self.controller_name.classify.constantize
+    keys_hash = {}
+    keys_array.each do |h|
+      keys_hash = deep_merge(keys_hash, h)
     end
+    @display_array = unravel(keys_hash)
+  end
 
+  private
+  # Get the class from the controller name.
+  # CountryController < InlineFormsController, so what class are we?
+  # TODO think about this a bit more.
+  def getKlass #:doc:
+    @Klass = self.controller_name.classify.constantize
   end
+
+  def deep_hashify(ary)
+    return ary.to_s if ary.length == 1
+    { ary.shift => deep_hashify(ary) }
+  end
+
+  def deep_merge(h1, h2)
+    return h1.merge(h2) unless h2.first[1].is_a? Hash
+    h1.merge(h2){|key, first, second| deep_merge(first, second)}
+  end
+
+  def unravel(deep_hash, level=-1)
+    level += 1
+    return "#{'  '*level}\"#{deep_hash.first[0]}\": \"#{deep_hash.first[1]}\"\n" unless deep_hash.first[1].is_a? Hash
+    a = "#{'  '*level}\"#{deep_hash.first[0]}\":\n"
+    deep_hash.first[1].each do |k,v|
+      a << unravel( { k => v}, level)
+    end
+    a
+  end
+
+end