adminpanel 1.2.6 → 1.2.7

data/.gitignore

@@ -4,6 +4,7 @@
 /coverage/
 /Gemfile.lock
 /spec/reports/
+/spec/dummy/log/
 /spec/dummy/public/uploads/
 /InstalledFiles
 /pkg/

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

@@ -26,7 +26,7 @@
 
 <br/>
 
-<table class="table table-striped table-bordered">
+<table id="<%= model %>-table" class="table table-striped table-bordered">
   <tr>
    <th><%= t("category.name") %></th>
    <th><%= t("actions") %></th>

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

@@ -1,4 +1,3 @@
-
 <%= custom_form_for(resource, :remote => true, :html => {:class => "form-horizontal", :id => "new_resource"}) do |f| -%>
   <div class="row-fluid">
     <div class="modal-body">
@@ -8,7 +7,7 @@
     </div>
   </div>
   <div class="modal-footer">
-    <button class="btn" data-dismiss="modal" aria-hidden="true"><%= I18n.t('action.close') %></button>
+    <button id="modal-button" class="btn" data-dismiss="modal" aria-hidden="true"><%= I18n.t('action.close') %></button>
     <%= f.submit t("action.add") + " " + @model.display_name, :disable_with => t("action.submitting"), :id =>"new-resource-button" %>
   </div>
 <% end -%>

data/app/views/adminpanel/categories/create.js.erb

@@ -0,0 +1,6 @@
+$("#modal-button").trigger("click");
+row = "<tr><td><%= escape_javascript link_to resource.name, category_path(resource) %></td>";
+row = row + "<td><%= escape_javascript link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_category_path(category), :title => 'Editar' %> ";
+row = row + "<%= escape_javascript link_to content_tag(:i, nil, :class => 'icon-remove'),[category], :title => 'Editar', :method => :delete %></td>";
+row = row + "</tr>";
+$("#<%= resource.model %>-table").append(row);

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end

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

@@ -6,14 +6,6 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 			if Rails.env.development?
 				Adminpanel::User.new(:email => 'admin@admin.com', :name => "Admin", :password => 'password', :password_confirmation => 'password').save
 				puts "The password for admin@admin.com is: password"
-			else
-				characters = ("a".."z").to_a << ("A".."Z").to_a << (0..9).to_a <<(["!","@","#","$","%","^","&","*","(",")", "_", "-","+", "="])
-				password = ""
-				8.times do
-					password = password + "#{characters.sample}"
-				end
-				puts "The password for admin@admin.com is: #{password}"
-				Adminpanel::User.new(:email => "admin@admin.com", :name => "Admin", :password => password, :password_confirmation => password).save
 			end
 		end
 	end

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

@@ -250,7 +250,7 @@ module Adminpanel
 			end
 
 			def generate_gallery
-				Rails::Generators.invoke("adminpanel:gallery", [@attr_field, lower_name])
+				Rails::Generators.invoke("adminpanel:gallery", lower_name)
 			end
 
 		end

data/lib/tasks/adminpanel/adminpanel.rake

@@ -25,14 +25,60 @@ namespace :adminpanel do
     s.save
   end
 
-  task :dump => :dump_sections
+  task :user => :environment do |t|
+    characters = []
+    characters.concat(("a".."z").to_a)
+    characters.concat(("A".."Z").to_a)
+    characters.concat((0..9).to_a)
+    characters.concat(%w[! @ \# $ % ^ & * , _ - + =])
+    password = ""
+    8.times do
+      password = password + "#{characters.sample}"
+    end
+    puts "Creating/overwriting admin@codn.com with password #{password}"
+    user = Adminpanel::User.find_by_email('admin@codn.com')
+    if !user.nil?
+      user.delete
+    end
+
+    Adminpanel::User.new(
+      :email => 'admin@codn.com',
+      :name => 'CoDN',
+      :password => password,
+      :password_confirmation => password
+    ).save
+  end
+
+  task :dump => :environment do |t|
+    puts "Dumping adminpanel_sections and adminpanel_categories into db/seeds.rb"
+    File.open("db/seeds.rb", "w") do |f|
+        f << "Adminpanel::Section.delete_all\n"
+        f << "Adminpanel::Category.delete_all\n"
+      Adminpanel::Section.all.each do |section|
+        f << "#{creation_command_section(section)}"
+      end
+      Adminpanel::Category.all.each do |category|
+        f << "#{creation_command_category(category)}"
+      end
+    end
+  end
 
   task :dump_sections => :environment do |t|
     puts "Dumping adminpanel_sections table into db/seeds.rb"
     File.open("db/seeds.rb", "w") do |f|
         f << "Adminpanel::Section.delete_all\n"
       Adminpanel::Section.all.each do |section|
-        f << "#{creation_command(section)}"
+        f << "#{creation_command_section(section)}"
+      end
+    end
+  end
+
+  task :dump_categories => :environment do |t|
+    puts "Dumping adminpanel_categories table into db/seeds.rb"
+    File.open("db/seeds.rb", "w") do |f|
+        f << "Adminpanel::Section.delete_all\n"
+      Adminpanel::Section.all.each do |section|
+        f << "#{creation_command_categories(section)}"
       end
     end
   end
@@ -91,7 +137,7 @@ namespace :adminpanel do
         end
       end
 
-      instance.save
+      instance.save(:validate => false)
 
       change_dates(instance)
 
@@ -106,16 +152,22 @@ end
 
 private
 
-  def creation_command(section)
+  def creation_command_section(section)
     "Adminpanel::Section.new(\n" +
-    ":name => \"#{section.name}\",\n" +
+    "\t:name => \"#{section.name}\",\n" +
     "\t:has_description => #{section.has_description},\n" +
     "\t:description => \"#{section.description}\",\n" +
     "\t:key => \"#{section.key}\",\n" +
     "\t:page => \"#{section.page}\",\n" +
     "\t:has_image => #{section.has_image}\n" +
     ").save\n"
+  end
 
+  def creation_command_category(category)
+    "Adminpanel::Category.new(\n" +
+    "\t:name => \"#{category.name}\",\n" +
+    "\t:model => \"#{category.model}\"\n" +
+    ").save\n"
   end
 
   def create_image_of(model_id)

data/spec/tasks/adminpanel_rake_spec.rb

@@ -45,4 +45,13 @@ describe "adminpanel rake task" do
       )
     end
   end
+
+  describe 'adminpanel:user' do
+    before do
+      Rake.application.invoke_task "adminpanel:user"
+    end
+    it 'should create admin@codn user' do
+      Adminpanel::User.last.email.should eq('admin@codn.com')
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adminpanel
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 2
-  - 6
-  version: 1.2.6
+  - 7
+  version: 1.2.7
 platform: ruby
 authors: 
 - Jose Ramon Camacho
@@ -436,6 +436,7 @@ files:
 - app/views/adminpanel/.DS_Store
 - app/views/adminpanel/categories/_categories_table.html.erb
 - app/views/adminpanel/categories/_category_form.html.erb
+- app/views/adminpanel/categories/create.js.erb
 - app/views/adminpanel/categories/index.html.erb
 - app/views/adminpanel/categories/new.js.erb
 - app/views/adminpanel/galleries/_galleries_table.html.erb