adminpanel 1.2.11 → 1.2.12

data/app/assets/javascripts/adminpanel/images_form.js

@@ -1,14 +1,20 @@
 $(document).ready(function(){
 	$('form').on('click', '.add_fields', function(e) {
-		time = new Date().getTime();
-		regexp = new RegExp($(this).data('id'), 'g');
-		$(this).before($(this).data('fields').replace(regexp, time));
 		e.preventDefault();
+		var $collectionContainer = $(this).closest('.file-collection-container');
+		var maxFiles = $collectionContainer.data('max');
+		var numberOfFiles = $collectionContainer.find('.product-image:not(.hidden)').length + 1;
+
+		if (maxFiles == '0' || numberOfFiles <= maxFiles) {
+			time = new Date().getTime();
+			regexp = new RegExp($(this).data('id'), 'g');
+			$(this).before($(this).data('fields').replace(regexp, time));
+		}
 	});
 
 	$('form').on('click', '.remove_fields', function(e){
 		$(this).prev('input[type=hidden]').val('1');
-		$(this).parent().parent().parent().hide();
+		$(this).parent().parent().parent().addClass('hidden');
 		e.preventDefault();
 	});
-});
+});

data/app/controllers/adminpanel/analytics_controller.rb

@@ -15,8 +15,9 @@ module Adminpanel
 
 
 				client = Google::APIClient.new(
-				  :application_name => 'Adminpanel',
-				  :application_version => '1.0.0')
+				  :application_name => 'AdminPanel',
+				  :application_version => '1.0.0'
+        )
 
 				analytics = nil
 				# Load cached discovered API, if it exists. This prevents retrieving the
@@ -35,10 +36,11 @@ module Adminpanel
 				key = Google::APIClient::KeyUtils.load_from_pkcs12(key_file, key_secret)
 				client.authorization = Signet::OAuth2::Client.new(
 					:token_credential_uri => 'https://accounts.google.com/o/oauth2/token',
-				  	:audience => 'https://accounts.google.com/o/oauth2/token',
-				  	:scope => 'https://www.googleapis.com/auth/analytics.readonly',
-				  	:issuer => service_account_email,
-				  	:signing_key => key
+				  :audience => 'https://accounts.google.com/o/oauth2/token',
+          :authorization_uri => 'https://accounts.google.com/o/oauth2/auth',
+				  :scope => 'https://www.googleapis.com/auth/analytics.readonly',
+				  :issuer => service_account_email,
+				  :signing_key => key
 				)
 				# Request a token for our service account
 				client.authorization.fetch_access_token!
@@ -46,14 +48,17 @@ module Adminpanel
 				startDate = DateTime.now.prev_month.strftime("%Y-%m-%d")
 				endDate = DateTime.now.strftime("%Y-%m-%d")
 
-				@visitCount = client.execute(:api_method => analytics.data.ga.get, :parameters => {
-				  'ids' => "ga:" + profileID,
-				  'start-date' => startDate,
-				  'end-date' => endDate,
-				  'dimensions' => "ga:day,ga:month",
-				  'metrics' => "ga:visits",
-				  'sort' => "ga:month,ga:day"
-				})
+				@visitCount = client.execute(
+          :api_method => analytics.data.ga.get,
+          :parameters => {
+  				  'ids' => "ga:#{profileID}",
+  				  'start-date' => startDate,
+  				  'end-date' => endDate,
+  				  'dimensions' => "ga:day,ga:month",
+  				  'metrics' => "ga:visits",
+  				  'sort' => "ga:month,ga:day"
+				  }
+        )
 
 				@visits = @visitCount.data.rows.collect do |r|
 				  	r[2]

data/app/models/adminpanel/gallery.rb

@@ -47,7 +47,7 @@ module Adminpanel
 		end
 
 		def self.display_name
-			"Galería"
+			I18n.t('Gallery')
 		end
 
 		def self.icon

data/app/views/adminpanel/categories/index.html.erb

@@ -1,4 +1,4 @@
-<%= provide(:page_title, "Categorias") %>
+<%= provide(:page_title, I18n.t('model.Categories')) %>
 
 <div class="row-fluid">
   <div class="widget widget-padding span12" id="wizard">

data/app/views/adminpanel/sections/edit.html.erb

@@ -22,11 +22,13 @@
           <% end %>
 
           <% if @section.has_image %>
-              <%= f.fields_for :images do |builder| %>
-                <%= render 'shared/image_fields', :f => builder %>
-              <% end -%>
+              <%= content_tag :div, :class => 'file-collection-container', :data => {:max => 1} do %>
+                <%= f.fields_for :images do |builder| %>
+                  <%= render 'shared/image_fields', :f => builder %>
+                <% end -%>
 
-              <%= link_to_add_fields "Agregar Imagen", f, :images %>
+                <%= link_to_add_fields "Agregar Imagen", f, :images %>
+              <% end %>
           <% end %>
       </div>
     </div>

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

@@ -14,10 +14,12 @@
 
 	<% elsif properties["type"] == "adminpanel_file_field" %>
 	<% if !defined? remote_request %>
-		<%= f.fields_for(attribute) do |builder| %>
-    	<%= render 'shared/image_fields', :f => builder %>
-  	<% end -%>
-  	<%= link_to_add_fields t("Add Image"), f, attribute %>
+		<%= content_tag :div, :class => 'file-collection-container', :data => {:max => properties['max-files'].nil? ? 0 : properties['max-files'] } do %>
+			<%= f.fields_for(attribute) do |builder| %>
+	    	<%= render 'shared/image_fields', :f => builder %>
+	  	<% end -%>
+  		<%= link_to_add_fields t("Add Image"), f, attribute %>
+		<% end %>
 
 	<% end %>
   <% elsif properties["type"] == "belongs_to" %>
@@ -88,7 +90,7 @@
 			%>
 		<% end %>
 	<% end %>
-	
+
   <% else %>
 		<% type = properties["type"] %>
 		<% args = properties.except("type", "name") %>

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

@@ -25,7 +25,7 @@
         <table id="information-table" class="table table-striped table-bordered dataTable">
           <thead><!-- model attributes -->
             <tr>
-              <% @model.display_attributes.each do |fields| %>
+              <% @model.display_attributes('index').each do |fields| %>
               <% fields.each do |attribute, properties| %>
                 <% if properties["type"] != "adminpanel_file_field" && properties["type"] != "has_many" %>
                   <th><%= properties["label"] %></th>
@@ -38,7 +38,7 @@
           <tbody>
             <% collection.each do |member| %>
               <tr>
-              <% @model.display_attributes.each do |fields| %>
+              <% @model.display_attributes('index').each do |fields| %>
               <% fields.each do |attribute, properties| %>
                 <% if properties["type"] == "wysiwyg_field" %>
                   <td><%= member.send(attribute).html_safe -%></td>

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

@@ -17,7 +17,7 @@
       </div>
       <div class="widget-body">
         <div class="widget-tickets widget-tickets-large clearfix"><ul>
-          <% @model.display_attributes.each do |fields| %>
+          <% @model.display_attributes('show').each do |fields| %>
            <% fields.each do |attribute, properties| %>
             <% if properties["type"] != "adminpanel_file_field" %>
             <li class="priority-high">

data/lib/adminpanel/active_record/adminpanel_extension.rb

@@ -89,11 +89,13 @@ module ActiveRecord
         return ":("
       end
 
-      def display_attributes
+      def display_attributes(type)
         display_attributes = []
         form_attributes.each do |attribute|
           attribute.each do |name, properties|
-            if properties["show"].nil? || properties["show"] == "true"
+            if properties['show'].nil? ||
+              properties['show'] == 'true' ||
+              properties['show'] == type
               display_attributes << attribute
             end
           end

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "1.2.11"
+  VERSION = "1.2.12"
 end

data/lib/generators/adminpanel/gallery/gallery_generator.rb

@@ -5,12 +5,6 @@ module Adminpanel
       source_root File.expand_path("../templates", __FILE__)
       desc "Generate the resource files necessary to use a model"
 
-      # argument :reference_model,
-      #   :aliases => "-m",
-      #   :type => :string,
-      #   :require => true,
-      #   :desc => 'Choose the model that you want the uploader to belong_to'
-
       def create_model
         template 'gallery_template.rb', "app/models/adminpanel/#{lower_name}.rb"
       end

data/lib/generators/adminpanel/initialize/templates/create_adminpanel_tables.rb

@@ -6,7 +6,7 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 			if Rails.env.development?
 				group = Adminpanel::Group.new(:name => "Admin")
 				group.save
-				Adminpanel::User.new(:email => 'admin@admin.com', :name => "Admin", :password => 'password', :password_confirmation => 'password', :group_id => group.object_id).save
+				Adminpanel::User.new(:email => 'admin@admin.com', :name => "Admin", :password => 'password', :password_confirmation => 'password', :group_id => group.id).save
 				puts "The password for admin@admin.com is: password"
 
 			end
@@ -17,6 +17,7 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 	    create_table :adminpanel_users do |t|
 	      t.string :name
 	      t.string :email
+	      t.string :group_id
 	      t.string :password_digest
 	      t.string :remember_token
 	      t.timestamps

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

@@ -112,20 +112,22 @@ module Adminpanel
 				fields.each do |attribute|
 
 					assign_attributes_variables(attribute)
-
-					if @attr_type == "string" || @attr_type == "float"
+					case(@attr_type)
+					when 'string', 'float'
 						form_hash = form_hash + "#{attribute_hash('text_field')}"
-					elsif @attr_type == "text" || @attr_type == "wysiwyg"
+					when 'text', 'wysiwyg'
 						form_hash = form_hash + "#{attribute_hash('wysiwyg_field')}"
-					elsif @attr_type == "integer"
+					when 'integer'
 						form_hash = form_hash + "#{attribute_hash('number_field')}"
-					elsif @attr_type == "datepicker"
+					when 'boolean'
+						form_hash = form_hash + "#{attribute_hash('boolean')}"
+					when 'datepicker'
 						form_hash = form_hash + "#{attribute_hash('datepicker')}"
-					elsif @attr_type == "images"
+					when 'images'
 						form_hash = form_hash + "#{file_field_hash}"
-					elsif @attr_type == "belongs_to"
+					when 'belongs_to'
 						form_hash = form_hash + "#{belongs_to_attribute_hash(belongs_to_field(@attr_field))}"
-					elsif @attr_type == "has_many" || @attr_type == "has_many_through"
+					when 'has_many', 'has_many_through'
 						if models_in_parameter(@attr_field).second.nil?
 							through_model = @attr_field
 						else
@@ -187,7 +189,6 @@ module Adminpanel
 
 			def model_type(type)
 				"\n\t\t\t\t\t'model' => 'Adminpanel::#{type}'"
-
 			end
 
 			def migration_string(field, type)

data/lib/tasks/adminpanel/adminpanel.rake

@@ -41,12 +41,17 @@ namespace :adminpanel do
       user.delete
     end
 
+    group = Adminpanel::Group.find_by_name("Admin")
+    if group.nil?
+      group = Adminpanel::Group.new(:name => "Admin")
+      group.save
+    end
     Adminpanel::User.new(
       :email => 'admin@codn.com',
       :name => 'CoDN',
       :password => password,
       :password_confirmation => password,
-      :group_id => Adminpanel::Group.find_by_name("Admin").object_id
+      :group_id => group.id
     ).save
   end
 

data/spec/generators/resource_generator_spec.rb

@@ -22,6 +22,7 @@ describe Adminpanel::Generators::ResourceGenerator do
 				name
 				description:wysiwyg
 				number:float
+				flag:boolean
 				quantity:integer
 				date:datepicker
 				photo:images
@@ -37,6 +38,7 @@ describe Adminpanel::Generators::ResourceGenerator do
 				migration_file('db/migrate/create_posts_table.rb').should(
 					contain(/t.string :name/) &&
 					contain(/t.float :number/) &&
+					contain(/t.boolean :flag/) &&
 					contain(/t.integer :quantity/) &&
 					contain(/t.string :date/) &&
 					contain(/t.text :description/)
@@ -70,6 +72,8 @@ describe Adminpanel::Generators::ResourceGenerator do
 					contain(/'type' => 'text_field',/) &&
 					contain(/'number' => \{/) &&
 					contain(/'type' => 'text_field',/) &&
+					contain(/'flag' => \{/) &&
+					contain(/'type' => 'boolean',/) &&
 					contain(/'quantity' => \{/) &&
 					contain(/'type' => 'number_field',/) &&
 					contain(/'date' => \{/) &&

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adminpanel
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 2
-  - 11
-  version: 1.2.11
+  - 12
+  version: 1.2.12
 platform: ruby
 authors: 
 - Jose Ramon Camacho
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-04-10 00:00:00 -05:00
+date: 2014-04-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency