adminpanel 1.1.0 → 1.2.0

data/Gemfile

@@ -12,7 +12,7 @@ gem "rails-i18n", "~> 3.0.0"
 gem "inherited_resources", "~> 1.3.1"
 gem "google-api-client", "~> 0.7.1"
 
-group :test do 
+group :test do
 	gem "bundler", "~> 1.3"
 	gem "activerecord", "3.2.12"
 	gem "rake", "~> 10.1.1"

data/app/models/adminpanel/image.rb

@@ -1,7 +1,7 @@
 module Adminpanel
 	class Image < ActiveRecord::Base
 		extend ImagesHelper
-		
+
 		attr_accessible :file, :foreign_key, :model
 		validates_presence_of :model
 		validates_presence_of :file
@@ -12,4 +12,4 @@ module Adminpanel
 	  		mount_uploader :file, Adminpanel::ImageUploader
 		end
 	end
-end
+end

data/app/views/shared/_error_messages.html.erb

@@ -6,7 +6,7 @@
 			<% object.errors.messages.keys.each do |field| %>
 				<% object.errors.messages[field].each do |value| %>
 				 <li>
-				 	<%= t("model.attributes.#{object.class.model_name}.#{field}") %>
+				 	<%= t("model.attributes.#{field}") %>
 				 	<%= value %>
 				 </li>
 				<% end %>
@@ -14,4 +14,4 @@
 			</ul>
 		</div>
 	</div>
-<% end %>
+<% end %>

data/app/views/shared/index.html.erb

@@ -1,10 +1,10 @@
 <% provide(:page_title, @model.display_name) -%>
 <div class="row-fluid">
-  <%= 
-    link_to( 
+  <%=
+    link_to(
       content_tag(:div,
-        content_tag(:i, nil, :class => 'icon-plus-sign icon-2x') + content_tag(:span, I18n.t("action.create") + " #{@model.display_name}", nil), 
-        :class => "btn btn-box span2"), 
+        content_tag(:i, nil, :class => 'icon-plus-sign icon-2x') + content_tag(:span, I18n.t("action.create") + " #{@model.display_name}", nil),
+        :class => "btn btn-box span2"),
       {
         :controller => params[:controller],
         :action => "new"
@@ -15,11 +15,11 @@
 <div class="row-fluid">
   <div class="widget widget-padding span12">
     <div class="widget-header">
-          <%= content_tag(:i, nil, :class => @model.icon) %>
-          <h5>
-            <%= @model.display_name %>
-          </h5>
-        </div>
+      <%= content_tag(:i, nil, :class => @model.icon) %>
+      <h5>
+        <%= @model.display_name %>
+      </h5>
+    </div>
     <div class="widget-body">
       <div class="dataTables_wrapper form-inline">
         <table id="information-table" class="table table-striped table-bordered dataTable">
@@ -52,30 +52,30 @@
               <% end %>
               <% end %>
                 <td>
-                  <%= 
-                  link_to( 
-                    content_tag(:i, nil, :class => 'icon-zoom-in'), 
+                  <%=
+                  link_to(
+                    content_tag(:i, nil, :class => 'icon-zoom-in'),
                     [member],
                     :title => t("action.show")
                   )
                   %>
-                
-                  <%= 
-                  link_to( 
-                    content_tag(:i, nil, :class => 'icon-pencil'), 
+
+                  <%=
+                  link_to(
+                    content_tag(:i, nil, :class => 'icon-pencil'),
                     [:edit, member],
                     :title => t("action.update") + " #{@model.display_name}"
                   )
                   %>
-                
-                  <%= 
-                  link_to( 
+
+                  <%=
+                  link_to(
                     content_tag(
-                      :i, 
-                      nil, 
+                      :i,
+                      nil,
                       :class => 'icon-remove'
-                    ), 
-                    [member], 
+                    ),
+                    [member],
                     :title => I18n.t("action.delete"),
                     :id => "resource-delete",
                     :method => :delete,
@@ -94,4 +94,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

data/config/locales/es.yml

@@ -7,85 +7,36 @@ es:
     Adminpanel::Image: "Imagen"
     Adminpanel::Category: "Categoría"
     Adminpanel::Client: "Cliente"
+    Adminpanel::Post: "Publicación"
+    Adminpanel::Adminproject: "Proyecto"
+    Adminpanel::Siteproject: "Proyecto"
     attributes:
-      Adminpanel::User:
-        email: "Correo electrónico"
-        password_digest: "Confirmar contraseña"
-        name: "Nombre"
-        password: "Contraseña"
-        password_confirmation: "Confirmar contraseña"
-      Adminpanel::Section:
-        description: "Descripción"
-        file: "Imagen"
-      Adminpanel::Gallery:
-        file: "Imagen"
-      Adminpanel::Category:
-        name: "Nombre"
-      Adminpanel::Product:
-        name: "Nombre"
-        brief: "Pequeña descripción"
-        category_id: "Categoría"
-      Adminpanel::Client:
-        username: "Nombre de usuario"
-        name: "Nombre"
-        password: "Contraseña"
-        password_confirmation: "Confirmar contraseña"
-        password_digest: "Confirmar contraseña"
+      adminproject_id: "Proyecto"
+      brief: "Pequeña descripción"
+      category_id: "Categoría"
+      client_id: "Cliente"
+      adminproject_id: "Proyecto"
+      description: "Descripción"
+      email: "Correo electrónico"
+      file: "Imagen"
+      name: "Nombre"
+      password: "Contraseña"
+      password_confirmation: "Confirmar contraseña"
+      password_digest: "Confirmar contraseña"
+      username: "Nombre de usuario"
   errors:
     one: "%{model} no pudo guardarse debido a 1 error"
     other: "%{model} no pudo guardarse debido a %{count} errores"
   activerecord:
     errors:
-      models:
-        adminpanel/category:
-          attributes:
-            name:
-              blank: "no puede estar vacío"
-        adminpanel/user:
-          attributes:
-            password_digest:
-              blank: "no puede estar vacío"
-            name:
-              blank: "no puede estar vacío"
-            password:
-              blank: "no puede estar vacío"
-              too_short: "es muy corta, mínimo 6 caracteres"
-              confirmation: "Deben ser iguales"
-            password_confirmation:
-              blank: "no puede estar vacío"
-            email:
-              blank: "no puede estar vacío"
-              invalid: "no es un correo"
-              taken: "ya está en uso"
-        adminpanel/gallery:
-          attributes:
-            file:
-              blank: "no puede estar vacía"
-        adminpanel/section:
-          attributes:
-            description:
-              blank: "no puede estar vacía"
-              too_long: "es muy larga"
-              too_short: "es muy corta"
-              not_a_number: "tienen que ser sólo números"
-            file:
-              blank: "no puede estar vacía"
-        adminpanel/product:
-          attributes:
-            name:
-              blank: "no puede estar vacío"
-            category_id:
-              blank: "no puede estar vacía"
-            brief:
-              blank: "no puede estar vacía"
-        gallery:
-          attributes:
-            description:
-              blank: "no puede estar vacía"
-            file:
-              blank: "no puede estar vacía"
-            name:
-              blank: "no puede estar vacío"
+      messages:
+        blank: "no puede estar vacío"
+        confirmation: "Deben ser iguales"
+        invalid: "no es un correo"
+        not_a_number: "tienen que ser sólo números"
+        taken: "ya está en uso"
+        too_long: "es muy larga"
+        too_short: "es muy corta, mínimo 6 caracteres"
   time:
     formats:
       graphic: "%Y-%m-%d %H:%M:%S"
@@ -133,4 +84,4 @@ es:
     password: "Contraseña"
     email: "Correo electrónico"
   other:
-    no description: "No tiene descripción aún"
+    no description: "No tiene descripción aún"

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/generators/adminpanel/resource/resource_generator.rb

@@ -4,17 +4,17 @@ module Adminpanel
 	module Generators
 		class ResourceGenerator < Rails::Generators::Base
 
-    		source_root File.expand_path("../templates", __FILE__)
-    		argument :resource_name, :type => :string, :default => "Resource"
-    		argument :fields, :type => :hash, :default => "name:string"
+  		source_root File.expand_path("../templates", __FILE__)
+  		argument :resource_name, :type => :string
+  		argument :fields, :type => :array, :default => "name:string"
 			desc "Generate the resource files necessary to use a model"
 
 			def self.next_migration_number(path)
-	 			Time.now.utc.strftime("%Y%m%d%H%M%S")
+	  		Time.now.utc.strftime("%Y%m%d%H%M%S")
 			end
 
 			def create_model
-        		template 'resource.rb', "app/models/adminpanel/#{lower_name}.rb"
+    		template 'resource.rb', "app/models/adminpanel/#{lower_name}.rb"
 			end
 
 			def create_controller
@@ -30,8 +30,9 @@ module Adminpanel
 
 		private
 			def is_a_resource?
-				fields.each do |field, type|
-					if type != "belongs_to"
+				fields.each do |attribute|
+					assign_attributes_variables(attribute)
+					if @attr_type != "belongs_to"
 						return true
 					end
 				end
@@ -70,51 +71,67 @@ module Adminpanel
 				models
 			end
 
+			def assign_attributes_variables(attribute)
+				if attribute.split(":").second.nil?
+					@attr_field = attribute
+					@attr_type = "string"
+				else
+					@attr_field = attribute.split(":").first
+					@attr_type = attribute.split(":").second
+				end
+			end
+
 			def symbolized_attributes
-		        attributes = ""
-		        fields.each do |field, type|
-		        	if type == "images"
-		            	attributes = attributes + ":images_attributes, "
-		        	elsif type == "belongs_to"
-		        		attributes = "#{attributes}:#{belongs_to_field(field)}, "
-		        	elsif type == "has_many" || type == "has_many_through"
-		        		if field.split(",").second == nil
-		        			attributes = "#{attributes}:#{has_many_field(field)}, "
-		        		else
-		        			model_name = models_in_parameter(field).first
-		        			attributes = "#{attributes}:#{has_many_field(model_name)}, "
-		        		end
-		        	else
-		            	attributes = attributes + ":#{field}, "
-		        	end
-		        end
-		        2.times do
-		        	attributes.chop! #to remove the last white space and the last ","
-		        end
-		        attributes
+        attr_string = ""
+        fields.each do |attribute|
+
+					assign_attributes_variables(attribute)
+
+        	if @attr_type == "images"
+            	attr_string = attr_string + ":images_attributes, "
+        	elsif @attr_type == "belongs_to"
+        		attr_string = "#{attr_string}:#{belongs_to_field(@attr_field)}, "
+        	elsif @attr_type == "has_many" || @attr_type == "has_many_through"
+        		if @attr_field.split(",").second == nil
+        			attr_string = "#{attr_string}:#{has_many_field(@attr_field)}, "
+        		else
+        			model_name = models_in_parameter(@attr_field).first
+        			attr_string = "#{attr_string}:#{has_many_field(model_name)}, "
+        		end
+        	else
+            	attr_string = attr_string + ":#{@attr_field}, "
+        	end
+        end
+        2.times do
+        	attr_string.chop! #to remove the last white space and the last ","
+        end
+        attr_string
 			end
 
 			def adminpanel_form_attributes
 				form_hash = ""
-				fields.each do |field, type|
-					if type == "string" || type == "float"
-						form_hash = form_hash + "\n\t\t\t\t{\"#{field}\" => {\"type\" => \"text_field\", \"name\" => \"#{field}\", \"label\" => \"#{field}\", \"placeholder\" => \"#{field}\"}},"
-					elsif type == "text" || type == "wysiwyg"
-						form_hash = form_hash + "\n\t\t\t\t{\"#{field}\" => {\"type\" => \"wysiwyg_field\", \"name\" => \"#{field}\", \"label\" => \"#{field}\", \"placeholder\" => \"#{field}\"}},"
-					elsif type == "integer" 
-						form_hash = form_hash + "\n\t\t\t\t{\"#{field}\" => {\"type\" => \"number_field\", \"name\" => \"#{field}\", \"label\" => \"#{field}\", \"placeholder\" => \"#{field}\"}},"
-					elsif type == "datepicker"
-						form_hash = form_hash + "\n\t\t\t\t{\"#{field}\" => {\"type\" => \"datepicker\", \"name\" => \"#{field}\", \"label\" => \"#{field}\", \"placeholder\" => \"#{field}\"}},"
-					elsif type == "images"
-						form_hash = form_hash + "\n\t\t\t\t{\"#{field}\" => {\"type\" => \"adminpanel_file_field\", \"name\" => \"#{field}\"}},"
-					elsif type == "belongs_to"
-						form_hash = form_hash + "\n\t\t\t\t{\"#{belongs_to_field(field)}\" => {\"type\" => \"belongs_to\", \"model\" => \"Adminpanel\:\:#{resource_class_name(field)}\", \"name\" => \"#{belongs_to_field(field)}\"}},"
-					elsif type == "has_many" || type == "has_many_through"
-						if models_in_parameter(field).second.nil? 
-							through_model = field
-						else 
-							through_model = models_in_parameter(field).first
-						end 
+				fields.each do |attribute|
+
+					assign_attributes_variables(attribute)
+
+					if @attr_type == "string" || @attr_type == "float"
+						form_hash = form_hash + "\n\t\t\t\t{\"#{@attr_field}\" => {\"type\" => \"text_field\", \"name\" => \"#{@attr_field}\", \"label\" => \"#{@attr_field}\", \"placeholder\" => \"#{@attr_field}\"}},"
+					elsif @attr_type == "text" || @attr_type == "wysiwyg"
+						form_hash = form_hash + "\n\t\t\t\t{\"#{@attr_field}\" => {\"type\" => \"wysiwyg_field\", \"name\" => \"#{@attr_field}\", \"label\" => \"#{@attr_field}\", \"placeholder\" => \"#{@attr_field}\"}},"
+					elsif @attr_type == "integer"
+						form_hash = form_hash + "\n\t\t\t\t{\"#{@attr_field}\" => {\"type\" => \"number_field\", \"name\" => \"#{@attr_field}\", \"label\" => \"#{@attr_field}\", \"placeholder\" => \"#{@attr_field}\"}},"
+					elsif @attr_type == "datepicker"
+						form_hash = form_hash + "\n\t\t\t\t{\"#{@attr_field}\" => {\"type\" => \"datepicker\", \"name\" => \"#{@attr_field}\", \"label\" => \"#{@attr_field}\", \"placeholder\" => \"#{@attr_field}\"}},"
+					elsif @attr_type == "images"
+						form_hash = form_hash + "\n\t\t\t\t{\"#{@attr_field}\" => {\"type\" => \"adminpanel_file_field\", \"name\" => \"#{@attr_field}\"}},"
+					elsif @attr_type == "belongs_to"
+						form_hash = form_hash + "\n\t\t\t\t{\"#{belongs_to_field(@attr_field)}\" => {\"@attr_type\" => \"belongs_to\", \"model\" => \"Adminpanel\:\:#{resource_class_name(@attr_field)}\", \"name\" => \"#{belongs_to_field(@attr_field)}\"}},"
+					elsif @attr_type == "has_many" || @attr_type == "has_many_through"
+						if models_in_parameter(@attr_field).second.nil?
+							through_model = @attr_field
+						else
+							through_model = models_in_parameter(@attr_field).first
+						end
 						through_model = resource_class_name(through_model)
 						form_hash = form_hash + "\n\t\t\t\t{\"#{has_many_field(through_model)}\" => {\"type\" => \"has_many\", \"model\" => \"Adminpanel\:\:#{through_model}\", \"name\" => \"#{has_many_field(through_model)}\"}},"
 					end
@@ -137,8 +154,9 @@ module Adminpanel
 			end
 
 			def has_associations?
-				fields.each do |field, type|
-					if type == "images" || type == "belongs_to" || type == "has_many" || type == "has_many_through"
+				fields.each do |attribute|
+					assign_attributes_variables(attribute)
+					if @attr_type == "images" || @attr_type == "belongs_to" || @attr_type == "has_many" || @attr_type == "has_many_through"
 						return true
 					end
 				end
@@ -147,15 +165,16 @@ module Adminpanel
 
 			def associations
 				association = ""
-				fields.each do |field, type|
-					if type == "belongs_to"
-						association = "#{association}#{belongs_to_association(field)}"
-					elsif type == "images"
+				fields.each do |attribute|
+					assign_attributes_variables(attribute)
+					if @attr_type == "belongs_to"
+						association = "#{association}#{belongs_to_association(@attr_field)}"
+					elsif @attr_type == "images"
 						association = "#{association}#{image_association}"
-					elsif type == "has_many" || type == "has_many_through"
-						association = "#{association}#{has_many_association(field)}"
+					elsif @attr_type == "has_many" || @attr_type == "has_many_through"
+						association = "#{association}#{has_many_association(@attr_field)}"
 					end
-						
+
 				end
 				association
 			end
@@ -166,24 +185,24 @@ module Adminpanel
 
 			def has_many_association(field)
 				if models_in_parameter(field).second.nil?
-					return "has_many :#{models_in_parameter(field).first}\n\t\t" + 
-					"has_many :#{models_in_parameter(field).first}, " + 
-					":through => :#{models_in_parameter(field).first}ation, " + 
+					return "has_many :#{models_in_parameter(field).first}\n\t\t" +
+					"has_many :#{models_in_parameter(field).first}, " +
+					":through => :#{models_in_parameter(field).first}ation, " +
 					":dependent => :destroy\n\t\t"
 				else
 					return "has_many :#{models_in_parameter(field).second}\n\t\t" +
-					"has_many :#{models_in_parameter(field).first}, " + 
-					":through => :#{models_in_parameter(field).second}, " + 
+					"has_many :#{models_in_parameter(field).first}, " +
+					":through => :#{models_in_parameter(field).second}, " +
 					":dependent => :destroy\n\t\t"
 				end
 			end
 
 			def image_association
-				return "has_many :images, :foreign_key => \"foreign_key\", " + 
-				":conditions => { :model => \"#{lower_name}\" } \n\t\t " +
+				return "has_many :images, :foreign_key => \"foreign_key\", " +
+				":conditions => { :model => \"#{lower_name}\" } \n\t\t" +
 				"accepts_nested_attributes_for :images, :allow_destroy => true\n\t\t" +
 				"#remember to change the association if you change this model display_name\n\t\t"
 			end
 		end
 	end
-end
+end