templus_models 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35c83ffacd6f178669cfb6d43114cbd6ae787305
-  data.tar.gz: d94154d77c68b597f8e36be9fd81336b158fc0e0
+  metadata.gz: f05fe347b6754ab181b55d2a1c2b664d0998700d
+  data.tar.gz: 5e7c69d642e70080dbffa76d7fc7302aa37f61f5
 SHA512:
-  metadata.gz: c1a2c73e6a953712e4de0c0f78f90a4191a6f26182a999f04ab7850921c0a7bd658f31f4f86b929ace106ff3a6b7dfbfd112c443196a329c027b89fc7d2ad842
-  data.tar.gz: 727bca49082fd25ff280a3752a099094ee16fde38e66648cc3c32e838730d755b06170c42dba40d313aebc137e189d8ee04bd8b16e4714ceff8725adb417fd28
+  metadata.gz: d9dc659f095c0ece74d165a71d569b8b1ab72afdc17ec7641ad1bf1dc2d8ad497c741de39f0d8fd46218a45df1fc6b711a0a846771ee5b5e8c3f4e39014795fe
+  data.tar.gz: c718ed02cbaae3c7ab28ef6e168a14a178f0732707ffce44b5b63de168b2cdd6e9d24d12483c98c5938c61cc6128f01caab8bbd038bc3c84d683d5d3aab40e67

data/app/helpers/crud_helper.rb

@@ -17,11 +17,11 @@ module CrudHelper
     return @@cruds.include?(attribute.to_s)
   end
   
-  def menu_helper_crud(modelo, url, nome, classe,icon='')
+  def menu_helper_crud(modelo, url, nome, classe, icon='')
     if can?(:read, classe)
       buffer = ""
       buffer << "<li class='childreen #{controller.controller_name == 'crud' and params[:model] == modelo ? 'active' : '' }'>"
-      buffer << link_to("<i class='icon-#{icon}'></i><span>#{nome}</span>".html_safe, url, data: {push: true, crumb: 'wielka'})
+      buffer << link_to("<i class='#{icon}'></i><span>#{nome}</span>".html_safe, url, data: {push: true, crumb: 'wielka'})
       buffer << "</li>"
       buffer.html_safe
     end

data/app/raro_crud/raro_crud.rb

@@ -165,7 +165,8 @@ class RaroCrud
             data: {push: 'partial', target: '#form'},
             icon: "fa fa-#{opts[:icon]}",
             class: 'btn btn-small btn-primary btn-rounded',
-            link: "#{self.root_path}/#{opts[:link]}"
+            link: "#{self.root_path}/#{opts[:link]}",
+            can: opts[:can]
           }
     )
   end 

data/app/views/crud/_crud_template.html.erb

@@ -15,7 +15,11 @@
 
 	<% content_for :actions do %>
 		<% @crud_helper.top_links.each do |link| %>
-			<%=render_link(link)%>
+			<% if link[:can].present? %>
+				<%=render_link(link) if self.instance_eval &link[:can]%>
+			<% else %>
+				<%=render_link(link)%>
+			<% end %>
 		<%end%>
 		<% if @crud_helper.search_fields.present? %>
 			<button id="button_search_<%=@model.name.underscore%>" class="btn btn-warning btn-rounded" data-toggle="modal" data-target="#modal_search">

data/app/views/layouts/_template_raro_crud.html.erb

@@ -29,22 +29,26 @@
 		<div class="col-lg-12">
 			<div class="ibox float-e-margins">
 				<div class="ibox-title">
-					<% if is_action_edit? && @model.present?%>
-						<h5>Editar 
-							<small> você pode editar todos os seus dados. <%=@model.name.humanize %></small>
-						</h5>
-					<% elsif is_action_create? && @model.present? %>
-						<h5>Cadastrar
-							<small> você pode cadastrar todos os seus dados. <%=@model.name.humanize %></small>
-						</h5>
-					<% elsif is_action_show? && @crud_helper.present? %>
-						<h5><%= @crud_helper.subtitle(:show) %>
-							<small><%= @crud_helper.description(:show) %></small>
-						</h5>
-					<% elsif @crud_helper.present? %>
-						<h5><%= @crud_helper.subtitle(:index) %>
-							<small><%= @crud_helper.description(:index) %></small>
-						</h5>
+					<% unless content_for? :title %>
+						<% if is_action_edit? && @model.present?%>
+							<h5>Editar 
+								<small> você pode editar todos os seus dados. <%=@model.name.humanize %></small>
+							</h5>
+						<% elsif is_action_create? && @model.present? %>
+							<h5>Cadastrar
+								<small> você pode cadastrar todos os seus dados. <%=@model.name.humanize %></small>
+							</h5>
+						<% elsif is_action_show? && @crud_helper.present? %>
+							<h5><%= @crud_helper.subtitle(:show) %>
+								<small><%= @crud_helper.description(:show) %></small>
+							</h5>
+						<% elsif @crud_helper.present? %>
+							<h5><%= @crud_helper.subtitle(:index) %>
+								<small><%= @crud_helper.description(:index) %></small>
+							</h5>
+						<% end %>
+					<% else %>
+						<%= yield :title %>
 					<% end %>
 					<div class="pull-right actions">
 						<% if content_for? :actions %>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -405,7 +405,6 @@ files:
 - test/dummy/tmp/cache/assets/development/sprockets/v3.0/yXXUoKEykhpZPMXWVzUf3GtTwgAtNSDCOK6TvomSdoM.cache
 - test/dummy/tmp/cache/assets/development/sprockets/v3.0/zsJ7Mb8REasrj4nUuq6H0d0o74xxuUlQk7KtCJSdqMg.cache
 - test/dummy/tmp/cache/assets/development/sprockets/v3.0/zwqXp6G2mEvMWMFcZeiFfb2jr3PymMGXDPQdfjBCrR0.cache
-- test/dummy/tmp/pids/server.pid
 - test/integration/navigation_test.rb
 - test/lib/generators/crud_generator_test.rb
 - test/templus_models_test.rb
@@ -430,7 +429,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Easy CRUD generator for Rails Projects
@@ -686,7 +685,6 @@ test_files:
 - test/dummy/tmp/cache/assets/development/sprockets/v3.0/Z6u7GBxS_lJQoT58OLOlQ45pyYfRR9Cv3hTyfbLYbjw.cache
 - test/dummy/tmp/cache/assets/development/sprockets/v3.0/zsJ7Mb8REasrj4nUuq6H0d0o74xxuUlQk7KtCJSdqMg.cache
 - test/dummy/tmp/cache/assets/development/sprockets/v3.0/zwqXp6G2mEvMWMFcZeiFfb2jr3PymMGXDPQdfjBCrR0.cache
-- test/dummy/tmp/pids/server.pid
 - test/integration/navigation_test.rb
 - test/lib/generators/crud_generator_test.rb
 - test/templus_models_test.rb

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-3853