adminpanel 1.2.9 → 1.2.10

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

@@ -13,30 +13,82 @@
 		<% end %>
 
 	<% 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 %>
 
+	<% end %>
   <% elsif properties["type"] == "belongs_to" %>
+	<% if !defined? remote_request %>
 		<% args = properties.except("type", "name", "model") %>
 		<% args.symbolize_keys! %>
   	<%= f.select(attribute, (@collections["#{properties["model"]}"].collect{|resource| [resource.name, resource.id]}), args) %>
 
-  <% elsif properties["type"] == "has_many" %>
-		<%#= f.checkbox(collection, relationship) %>
+
+		<% if(properties['remote_resource'].nil? || properties['remote_resource']) %>
+			<!-- Button to create a new of this belongs_to resource -->
+			<% model_name = properties['model'].classify.constantize.model_name.demodulize.downcase %>
+			<%=
+			link_to(
+				I18n.t('other.add',
+					:model => properties['model'].classify.constantize.display_name
+				),
+				polymorphic_path(
+					[:new, :"#{model_name}"],
+					:model => @model.display_name,
+					:model_name => @model.name.demodulize.downcase,
+					:belongs_request => true
+				),
+				:class => 'btn btn-info',
+				:id => "#{model_name}-modal-link",
+				:'data-target' => "#new-modal",
+				:'data-toggle' => 'modal',
+				:remote => true
+			)
+			%>
+		<% end %>
+
+
+	<% end %>
+  <% elsif properties['type'] == 'has_many' %>
+	<% if !defined? remote_request %>
 		<div class="control-group">
 			<div class="control-label">
-				<%= I18n.t('other.choose', :model => pluralize_es(properties["model"].classify.constantize.display_name)) %>
+				<%= I18n.t('other.choose', :model => pluralize_es(properties['model'].classify.constantize.display_name)) %>
 			</div>
 	  	<%= hidden_field_tag("#{class_name_downcase(f.object)}[#{relationship_ids(properties["model"])}][]", nil) %>
-			<div class="controls">
-		  	<% @collections["#{properties["model"]}"].each do |resource| %>
+			<div class="controls" id="<%= properties['model'].demodulize.downcase %>-relation">
+		  	<% @collections["#{properties['model']}"].each do |resource| %>
 		  		<%= f.checkbox(resource, class_name_downcase(f.object) ,relationship_ids(properties["model"])) %>
 				<% end %>
 			</div>
 		</div>
 
+		<% if properties['remote_resource'].nil? || propeties['remote_resource'] %>
+			<!-- Button to create a new of this has_many resource -->
+			<% model_name = properties['model'].classify.constantize.model_name.demodulize.downcase %>
+			<%=
+			link_to(
+				I18n.t('other.add',
+					:model => properties['model'].classify.constantize.display_name
+				),
+				polymorphic_path(
+					[:new, :"#{model_name}"],
+					:model => @model.display_name,
+					:model_name => @model.name.demodulize.downcase
+				),
+				:class => 'btn btn-info',
+				:id => "#{model_name}-modal-link",
+				:'data-target' => "#new-modal",
+				:'data-toggle' => 'modal',
+				:remote => true
+			)
+			%>
+		<% end %>
+	<% end %>
+	
   <% else %>
 		<% type = properties["type"] %>
 		<% args = properties.except("type", "name") %>

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

@@ -0,0 +1,8 @@
+<div id="new-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-header" id="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="modal-title"></h3>
+  </div>
+  <div id="modal-container">
+  </div>
+</div>

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

@@ -0,0 +1,12 @@
+<%= custom_form_for(resource, :url => {:action => :create, :model => params[:model], :model_name => params[:model_name], :belongs_request => params[:belongs_request] }, :remote => true, :html => {:class => "form-horizontal", :id => "new_resource"}) do |f| -%>
+  <div class="row-fluid">
+    <div class="modal-body">
+        <%= render 'shared/error_messages', :object => resource %>
+        <%= render 'shared/form_fields', :f => f, :remote_request => true %>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <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/shared/create_belongs_to.js.erb

@@ -0,0 +1,5 @@
+var model_name = "<%= params[:model_name] %>";
+var new_model = "<%= @model.name.demodulize.downcase %>";
+var option = '<option value="<%= resource.id %>" selected="selected"><%= resource.name %></option>';
+$("#" + model_name + "_" + new_model + "_id").append(option);
+$("#new-modal").modal('toggle');

data/app/views/shared/create_has_many.js.erb

@@ -0,0 +1,5 @@
+var model_name = "<%= params[:model_name] %>";
+var new_model = "<%= @model.name.demodulize.downcase %>";
+row = '<label class="checkbox"><input checked="checked" id="' + model_name + '_' + new_model + '_ids_" name="' + model_name + '[' + new_model + '_ids][]" type="checkbox" value="<%= resource.id %>"><%= resource.name %></label>';
+$("#" + new_model + "-relation").append(row);
+$("#new-modal").modal('toggle');

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

@@ -26,3 +26,4 @@
       <% end -%>
   </div>
 </div>
+<%= render 'shared/modal' %>

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

@@ -1,6 +1,6 @@
 <% provide(:page_title, t("action.create") + " #{@model.display_name.capitalize}") -%>
 <% breadcrumb_add(
-  @model.display_name.capitalize.pluralize, 
+  @model.display_name.capitalize.pluralize,
     {
       :controller => params[:controller],
       :action => "index"
@@ -15,14 +15,25 @@
     </div>
     <div class = "widget-body">
       <div class = "widget-forms clearfix">
-        <%= custom_form_for(resource, :html => {:class => "form-horizontal", :id => "new_resource"}) do |f| -%>
+        <%=
+        custom_form_for(
+          resource, :html => {
+            :class => "form-horizontal",
+            :id => "new_resource"
+          }
+        ) do |f| -%>
           <%= render 'shared/error_messages', :object => resource %>
           <%= render 'shared/form_fields', :f => f %>
       </div>
     </div>
     <div class = "widget-footer">
-      <%= f.submit t("action.add") + " " + @model.display_name, :disable_with => t("action.submitting"), :id =>"new-resource-button" %>
+      <%=
+      f.submit t("action.add") + " " + @model.display_name,
+        :disable_with => t("action.submitting"),
+        :id =>"new-#{@model.name.demodulize}-button"
+      %>
     </div>
       <% end -%>
   </div>
-</div>
+</div>
+<%= render 'shared/modal' %>

data/app/views/shared/new.js.erb

@@ -0,0 +1,2 @@
+$("#modal-title").html('Agregar <%= @model.display_name %>');
+$("#modal-container").html('<%= escape_javascript(render "shared/remote_form_fields", :resource => resource) %>');

data/config/locales/es.yml

@@ -8,10 +8,10 @@ es:
       brief: "Pequeña descripción"
       category_id: "Categoría"
       client_id: "Cliente"
-      adminproject_id: "Proyecto"
       description: "Descripción"
       email: "Correo electrónico"
       file: "Imagen"
+      group_id: "Rol de usuario"
       name: "Nombre"
       password: "Contraseña"
       password_confirmation: "Confirmar contraseña"
@@ -55,8 +55,9 @@ es:
     delete confirmation: "Estás seguro que desea eliminar?"
   authentication:
     welcome: "Bienvenido! Inicia Sesión"
-    signin error: "Contraseña incorrecta"
-    signin success: "Bienvenido!"
+    signin_error: "Correo y/o Contraseña incorrecta."
+    signin_success: "Bienvenido!"
+    not_authorized: 'No tienes permisos para acceder'
   gallery:
     new: "Agregar Imagen"
     success: "La imagen ha sido guardada"
@@ -79,6 +80,7 @@ es:
     password: "Contraseña"
     email: "Correo electrónico"
   other:
+    add : "Agregar %{model}"
     choose: "Selecciona %{model} pertenecientes"
     no description: "No tiene descripción aún"
   key:

data/lib/adminpanel.rb

@@ -5,6 +5,7 @@ require "adminpanel/active_record/adminpanel_extension"
 require "carrierwave"
 require "carrierwave/orm/activerecord"
 require "google/api_client"
+require 'cancan'
 
 module Adminpanel
 end

data/lib/adminpanel/active_record/adminpanel_extension.rb

@@ -43,10 +43,6 @@ module ActiveRecord
         default_scope { order("position ASC")}
       end
 
-      # def self.of_parent(field, id)
-      #   where(field.to_sym => id)
-      # end
-
       def form_attributes
         [{
           "name" => {

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "1.2.9"
+  VERSION = "1.2.10"
 end

data/lib/generators/adminpanel/initialize/initialize_generator.rb

@@ -25,6 +25,11 @@ module Adminpanel
 				:aliases => '-p',
 				:default => false,
 				:desc => 'Skip setup if true'
+			class_option :'skip-setup',
+				:type => :boolean,
+				:aliases => '-y',
+				:default => false,
+				:desc => 'Skip cancan\'s ability.rb'
 
 			def create_initializers
 				if !options[:'skip-setup']
@@ -32,6 +37,12 @@ module Adminpanel
 				end
 			end
 
+			def create_ability
+				if !options[:'skip-ability']
+					copy_file 'ability.rb', 'app/models/ability.rb'
+				end
+			end
+
 			def create_categories
 				if !options[:'skip-category']
 					# puts "including category files"

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

@@ -0,0 +1,31 @@
+class Ability
+  include CanCan::Ability
+
+  def initialize(user)
+
+    if user.group.name == "Admin"
+      can :manage, :all
+    else
+      # cannot :manage, Adminpanel::User
+      # can :manage, Adminpanel::Analytic
+      # can :manage, Adminpanel::Section
+      # can :manage, Adminpanel::Gallery
+      # can :manage, Adminpanel::Category
+    end
+
+    # The first argument to `can` is the action you are giving the user
+    # permission to do.
+    # If you pass :manage it will apply to every action. Other common actions
+    # here are :read, :create, :update and :destroy.
+    #
+    # The second argument is the resource the user can perform the action on.
+    # If you pass :all it will apply to every resource. Otherwise pass a Ruby
+    # class of the resource.
+    #
+    # The third argument is an optional hash of conditions to further filter the
+    # objects.
+    # For example, here the user can only update published articles.
+    #
+    #   can :update, Article, :published => true
+  end
+end

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

@@ -11,11 +11,11 @@ Adminpanel.setup do |config|
   # config.analytics_key_path = "config/analytics"
 
   # # This are the modules that are going to be displayed and order that are going to be displayed
-  # config.displayable_resources = [
-  #   :analytics,
-  #   :users,
-  #   :galleries,
-  #   :sections,
-  #   :categories
-  # ]
+  config.displayable_resources = [
+    :analytics,
+    :users,
+    :galleries,
+    :sections,
+    :categories
+  ]
 end

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

@@ -4,8 +4,11 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 		# Create a default user
 		if direction == :up
 			if Rails.env.development?
-				Adminpanel::User.new(:email => 'admin@admin.com', :name => "Admin", :password => 'password', :password_confirmation => 'password').save
+				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
 				puts "The password for admin@admin.com is: password"
+
 			end
 		end
 	end
@@ -33,6 +36,11 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 	      t.timestamps
 	    end
 
+	    create_table :adminpanel_groups do |t|
+	      t.string :name
+	      t.timestamps
+	    end
+
 	    create_table :adminpanel_sections do |t|
 	      t.string :name
 	      t.boolean :has_description

data/lib/tasks/adminpanel/adminpanel.rake

@@ -45,7 +45,8 @@ namespace :adminpanel do
       :email => 'admin@codn.com',
       :name => 'CoDN',
       :password => password,
-      :password_confirmation => password
+      :password_confirmation => password,
+      :group_id => Adminpanel::Group.find_by_name("Admin").object_id
     ).save
   end
 

data/spec/dummy/app/models/ability.rb

@@ -0,0 +1,31 @@
+class Ability
+  include CanCan::Ability
+
+  def initialize(user)
+
+    if user.group.name == "Admin"
+      can :manage, :all
+    else
+      # cannot :manage, Adminpanel::User
+      # can :manage, Adminpanel::Analytic
+      # can :manage, Adminpanel::Section
+      # can :manage, Adminpanel::Gallery
+      # can :manage, Adminpanel::Category
+    end
+
+    # The first argument to `can` is the action you are giving the user
+    # permission to do.
+    # If you pass :manage it will apply to every action. Other common actions
+    # here are :read, :create, :update and :destroy.
+    #
+    # The second argument is the resource the user can perform the action on.
+    # If you pass :all it will apply to every resource. Otherwise pass a Ruby
+    # class of the resource.
+    #
+    # The third argument is an optional hash of conditions to further filter the
+    # objects.
+    # For example, here the user can only update published articles.
+    #
+    #   can :update, Article, :published => true
+  end
+end

data/spec/dummy/app/models/adminpanel/category.rb

@@ -1,6 +1,8 @@
 module Adminpanel
     class Category < ActiveRecord::Base
-        attr_accessible :product_ids, :name
+        attr_accessible :product_ids, :name, :model
+
+        validates_presence_of :model
 
         has_many :categorizations
 		    has_many :products, :through => :categorizations, :dependent => :destroy
@@ -9,6 +11,7 @@ module Adminpanel
         def self.form_attributes
           [
     				{"name" => {"type" => "text_field", "name" => "name", "label" => "name", "placeholder" => "name"}},
+    				# {'model' => {"type" => "text_field", "name" => "name", "label" => "name", "placeholder" => "name", 'show' => 'false'}},
     				{"product_ids" => {"type" => "has_many", "model" => "Adminpanel::Product", "name" => "product_ids"}},
           ]
         end

data/spec/features/authentication_pages_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
+require 'support/test_database'
 
 describe "Authentication" do
 
   	subject { page }
-  	
+
 	describe "sign in page" do
 	    before { visit adminpanel.signin_path }
 
@@ -20,7 +21,7 @@ describe "Authentication" do
 
 	    	it { expect(page).to have_title(I18n.t("Panel title")) }
 
-	      	it { should have_selector('div.alert.alert-error', :text => I18n.t("authentication.signin error")) }
+	      	it { should have_selector('div.alert.alert-error', :text => I18n.t("authentication.signin_error")) }
 	    end
 
 	    describe "with valid information" do
@@ -29,7 +30,7 @@ describe "Authentication" do
 	    		valid_signin(user)
 	    	end
 
-	    	it { should have_selector('div.alert.alert-success', :text => I18n.t("authentication.signin success")) }
+	    	it { should have_selector('div.alert.alert-success', :text => I18n.t("authentication.signin_success")) }
 	    	it { should have_selector('i.icon-off') }
 
 	    	describe "signing out" do
@@ -37,8 +38,8 @@ describe "Authentication" do
 
 	    		it { current_path.should == adminpanel.signin_path }
 	    		it { expect(page).to have_title(I18n.t("Panel title")) }
-	    		
+
 	    	end
 	    end
 	end
-end
+end

data/spec/features/galleries_pages_spec.rb

@@ -1,4 +1,6 @@
-require "spec_helper"
+require 'spec_helper'
+require 'support/test_database'
+
 
 describe "Gallery pages" do
 	subject {page}

data/spec/features/section_pages_spec.rb

@@ -1,4 +1,5 @@
-require "spec_helper"
+require 'spec_helper'
+require 'support/test_database'
 
 describe "Section pages" do
 	subject {page}