noodall-ui 0.4.6 → 0.4.7

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.
@@ -26,14 +26,6 @@ module Noodall
26
26
 
27
27
  def tree
28
28
  @options = {}
29
- @options[:_type] = params[:allowed_types] if params[:allowed_types]
30
- if params[:not_branch]
31
- @options.merge!(
32
- :_id => {"$ne" => BSON::ObjectId.from_string(params[:not_branch])},
33
- Node.path_field => {"$ne" => BSON::ObjectId.from_string(params[:not_branch])}
34
- )
35
- end
36
-
37
29
  respond_to do |format|
38
30
  format.html
39
31
  format.js
@@ -1,10 +1,15 @@
1
1
  <ol class="tree">
2
2
  <% for node in nodes %>
3
- <li><%= link_to h( node.title), node_path(node), :id => "id-#{node.id}" %>
4
- <% unless (children = node.children.where(options)).empty? -%>
5
- <span class="expand">+</span>
6
- <%= render :partial => 'branch', :locals => { :nodes => children, :options => options } %>
7
- <% end -%>
3
+ <li>
4
+ <% if params[:allowed_types].include?(node.class.to_s) && node.id != params[:not_branch] && !node.path.include?(params[:not_branch]) %>
5
+ <%= link_to h(node.title), node_path(node), :id => "id-#{node.id}" %>
6
+ <% else %>
7
+ <%= node.title %>
8
+ <% end %>
9
+ <% unless (children = node.children.where(options)).empty? -%>
10
+ <span class="expand">+</span>
11
+ <%= render :partial => 'branch', :locals => { :nodes => children, :options => options } %>
12
+ <% end -%>
8
13
  </li>
9
14
  <% end -%>
10
15
  </ol>
@@ -1,5 +1,5 @@
1
1
  module Noodall
2
2
  module UI
3
- VERSION = "0.4.6"
3
+ VERSION = "0.4.7"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: noodall-ui
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.6
4
+ version: 0.4.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-10-04 00:00:00.000000000Z
12
+ date: 2012-02-01 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: noodall-core
16
- requirement: &19006040 !ruby/object:Gem::Requirement
16
+ requirement: &25719160 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 0.7.2
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *19006040
24
+ version_requirements: *25719160
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: thoughtbot-sortable_table
27
- requirement: &19005540 !ruby/object:Gem::Requirement
27
+ requirement: &25718680 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 0.0.6
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *19005540
35
+ version_requirements: *25718680
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: will_paginate
38
- requirement: &19005060 !ruby/object:Gem::Requirement
38
+ requirement: &25718200 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '3.0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *19005060
46
+ version_requirements: *25718200
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: dynamic_form
49
- requirement: &19004580 !ruby/object:Gem::Requirement
49
+ requirement: &25717700 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *19004580
57
+ version_requirements: *25717700
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: bundler
60
- requirement: &19004120 !ruby/object:Gem::Requirement
60
+ requirement: &25717240 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
65
65
  version: 1.0.0
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *19004120
68
+ version_requirements: *25717240
69
69
  description: Noodall Rails User Interface Engine. Requires Noodall Core
70
70
  email:
71
71
  - steve@wearebeef.co.uk
@@ -656,7 +656,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
656
656
  version: '0'
657
657
  segments:
658
658
  - 0
659
- hash: 3390780952771030052
659
+ hash: 3260966802161771782
660
660
  required_rubygems_version: !ruby/object:Gem::Requirement
661
661
  none: false
662
662
  requirements: