templus_models 1.3.8 → 1.3.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 28d3a455c28b41654369312ed6014300fe3dc8bc
4
- data.tar.gz: 996142cde911189c50002f296e13837456e7cc72
3
+ metadata.gz: 3a928e5f6d63a6b07cb5141374333c9696443d36
4
+ data.tar.gz: 68a4c26033c7e9cea6deecadaf07d8e4acd1c681
5
5
  SHA512:
6
- metadata.gz: d2d5e917161cc7b28cb02f61546982772daad1b3fba5f3190fa9d9d4e079b433bfbaed3c64e748f5302931f2a0937e229780a55f02d36c15a7c7608b89b71e68
7
- data.tar.gz: e6a791963701601dad16721f905e5b4157015159460603bd9b59c77d415711101ff213c6d3616fe300ca3d8606936ba7020d69a7a3e6aec0c63d51a151e4a027
6
+ metadata.gz: 260315033d4e286744b3d462e03c8ab2f297feb894d047ed52a37d42f874de57f5d3d22850d1699079329c607a94b3a611b80fc207a4be13467135c3010ddef9
7
+ data.tar.gz: f840e7e765a9a90b49060bac7d0fdb0a09ef8ef9d34e2df7b9e528447eca5251c6cd3486da227b6191a55bd2237e5e15ca674684576e6ae679756e4f1e7cc789
@@ -83,9 +83,9 @@ class CrudController < ApplicationController
83
83
  respond_to do |format|
84
84
  if @saved
85
85
  flash[:success] = params[:id].present? ? "Cadastro alterado com sucesso." : "Cadastro efetuado com sucesso."
86
- format.html { redirect_to "/crud/#{@model.name.underscore}" }
86
+ format.html { redirect_to "/crud/#{@model.name.underscore}?page=#{params[:page]}" }
87
87
  unless params[:render] == 'modal'
88
- format.js { render action: :index }
88
+ format.js { render action: :index}
89
89
  else
90
90
  format.js
91
91
  end
@@ -11,7 +11,7 @@
11
11
  </div>
12
12
  </div>
13
13
  <%unless params[:render] == 'modal'%>
14
- <% url = "/crud/#{@model.name.underscore}/#{@record.new_record? ? 'create' : @record.id.to_s+'/create'}" %>
14
+ <% url = "/crud/#{@model.name.underscore}/#{@record.new_record? ? 'create' : @record.id.to_s+'/create'}?page=#{params[:page]}" %>
15
15
  <% remote_form = false%>
16
16
  <%else%>
17
17
  <% url = "/crud/#{@model.name.underscore}/#{@record.new_record? ? 'create?render=modal' : @record.id.to_s+'/create?render=modal'}" %>
@@ -37,7 +37,7 @@
37
37
  <div class="col-sm-4 col-sm-offset-2">
38
38
  <%= f.submit "Salvar", class: 'btn btn-primary' %>
39
39
  <%unless params[:render] == 'modal'%>
40
- <%= link_to "Voltar", "/crud/#{@model.name.underscore}", class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
40
+ <%= link_to "Voltar", "/crud/#{@model.name.underscore}?page=#{params[:page]}", class: 'btn btn-default', data: {push: 'partial', target: "#form"} %>
41
41
  <% end %>
42
42
  </div>
43
43
  </div>
@@ -63,16 +63,16 @@
63
63
  <% end %>
64
64
  <% end %>
65
65
  <%if @crud_helper.view_action && shold_view?(@crud_helper, record)%>
66
- <a href="/crud/<%=@model.name.underscore%>/<%=record.id%>"
66
+ <a href="/crud/<%=@model.name.underscore%>/<%=record.id%>?page=<%=params[:page]%>"
67
67
  class="btn btn-primary btn-xs" data-push="partial" data-target="#form">Visualizar</a>
68
68
  <% end %>
69
69
  <%if @crud_helper.edit_action && shold_edit?(@crud_helper, record) %>
70
- <a href="/crud/<%=@model.name.underscore%>/<%=record.id%>/edit"
70
+ <a href="/crud/<%=@model.name.underscore%>/<%=record.id%>/edit?page=<%=params[:page]%>"
71
71
  class="btn btn-primary btn-xs" data-push="partial" data-target="#form">Editar</a>
72
72
  <% end %>
73
73
  <%if @crud_helper.destroy_action && shold_destroy?(@crud_helper, record)%>
74
74
  <a href="/crud/<%=@model.name.underscore%>/<%=record.id%>/destroy"
75
- class="btn btn-danger btn-xs" data-push="partial" data-target="#form" data-method="delete">Excluir</a>
75
+ class="btn btn-danger btn-xs" data-push="partial" data-target="#form" data-method="delete" data-confirm="Você têm certeza?">Excluir</a>
76
76
  <% end %>
77
77
  </td>
78
78
  <% end %>
@@ -1,22 +1,26 @@
1
1
  <% if @crud_helper.scopes.present? %>
2
- <% @crud_helper.scopes.each do |escopo| %>
3
- <%= link_to "/crud/#{@model.name.underscore}?scope=#{escopo[0]}", id: "#{escopo[0]}", data: {push: true, crumb: 'wielka'} do%>
4
- <div style="float: left; margin-left: 10px; min-width: 100px;">
5
- <div class="widget style1 gray-bg">
6
- <div class="row vertical-align text-center">
7
- <h3 class="font-bold">
8
- <%= escopo[1] %>
9
- <span class="label label-success pull-right" style="margin-left: 10px;">
10
- <% if current_usuario.present? %>
11
- <%= @model.send(escopo[0]).accessible_by(current_ability, :read).count %>
12
- <% else %>
13
- <%= @model.send(escopo[0]).count %>
14
- <% end %>
15
- </span>
16
- </h3>
2
+ <% if @crud_helper.scopes.class == Array %>
3
+ <% @crud_helper.scopes.each do |escopo| %>
4
+ <%= link_to "/crud/#{@model.name.underscore}?scope=#{escopo[0]}", id: "#{escopo[0]}", data: {push: true, crumb: 'wielka'} do%>
5
+ <div style="float: left; margin-left: 10px; min-width: 100px;">
6
+ <div class="widget style1 gray-bg">
7
+ <div class="row vertical-align text-center">
8
+ <h3 class="font-bold">
9
+ <%= escopo[1] %>
10
+ <span class="label label-success pull-right" style="margin-left: 10px;">
11
+ <% if current_usuario.present? %>
12
+ <%= @model.send(escopo[0]).accessible_by(current_ability, :read).count %>
13
+ <% else %>
14
+ <%= @model.send(escopo[0]).count %>
15
+ <% end %>
16
+ </span>
17
+ </h3>
18
+ </div>
17
19
  </div>
18
20
  </div>
19
- </div>
20
- <%end%>
21
+ <%end%>
22
+ <% end %>
23
+ <% else %>
24
+ <%= render @crud_helper.scopes %>
21
25
  <% end %>
22
26
  <% end %>
@@ -1,3 +1,3 @@
1
1
  module TemplusModels
2
- VERSION = "1.3.8"
2
+ VERSION = "1.3.9"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: templus_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.8
4
+ version: 1.3.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rodrigo Sol
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-08-18 00:00:00.000000000 Z
12
+ date: 2015-08-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -960,7 +960,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
960
960
  version: '0'
961
961
  requirements: []
962
962
  rubyforge_project:
963
- rubygems_version: 2.4.2
963
+ rubygems_version: 2.2.2
964
964
  signing_key:
965
965
  specification_version: 4
966
966
  summary: Easy CRUD generator for Rails Projects