faalis 0.26.2 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92d7b2d893edde43de939e15586954f6b8dc68aa
-  data.tar.gz: c77cf59814dddbce2f6d1c0f68057f3f168c6acd
+  metadata.gz: 5c0a338ff781d4e2f82be9357639ef61f67049a9
+  data.tar.gz: f539d91742b122aee9c3a15e3ca0dfb6af10ebbd
 SHA512:
-  metadata.gz: b3f36ee29389c4100a4de86bcbade9af8ca01f2b21b1ccfcfba9bc4a8847dff3a988d7c1db3ee806c44392dd0935bc954a03e1f3be1bee7e35f2b068e387c20f
-  data.tar.gz: 234fd4c6a456e2dce2149d198ff264e5d54f30e0be048e88a15e36197266f58131149cc528e7195f5ec530a9145cda801730c1619e1b8e1e11f2a781403b2e2a
+  metadata.gz: 264b08d4bb16071c762e62597abc5f75bb7f45183f8a073f06c1a277e82b644e2109806c2d8654197b7553e93adf691adf36fb8f92c425f6151282ed286a20aa
+  data.tar.gz: 2f3222bbc2b265690cd13c77f024b9b0ef42d8441e41c1110588e1a630178ca21739449c5fa02a79ef020028d6fdfe47ef0b1785d858438a19751ecaf23a9f77

data/lib/faalis/generators/concerns/tabs.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Faalis
   module Generators
     module Concerns
@@ -9,27 +11,46 @@ module Faalis
       module Tabs
 
         private
-
         # Process the user provided tabs
         # @return a Hash of tabs like
         def tabs
-          if resource_data.include? "tabs"
+          tabbed_fields = Set.new
 
-            tabs = resource_data["tabs"]
+          if resource_data.include? 'tabs'
+
+            tabs = resource_data['tabs']
             result = {}
             tabs.each do |tab|
-              name = tab["name"]
-              fields_list = fields_with("tab", tab["id"])
+              name = tab['name']
+              fields_list = fields_with('tab', tab['id'])
+              fields_list.each do |f|
+                tabbed_fields << f
+              end
               result[name] = fields_list
             end
+            all_fields = Set.new resource_data['fields']
+
+            result.each do |k, v|
+              if v.empty?
+                diff = (all_fields ^ tabbed_fields).to_a
+                result[k] = diff
+              end
+            end
             return result
           else
             {}
           end
         end
 
+        def tab_has_field?(tab_name, field_name)
+          it_does = tabs[tab_name].select do |f|
+            f['name'] == field_name
+          end
+          !it_does.empty?
+        end
+
         def any_tabs?
-          resource_data.include? "tabs"
+          resource_data.include? 'tabs'
         end
 
       end

data/lib/faalis/version.rb

@@ -18,5 +18,5 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  VERSION = "0.26.2"
+  VERSION = "0.26.3"
 end

data/lib/generators/faalis/templates/js/list_view/new.html.erb

@@ -35,7 +35,7 @@
     <fieldset class="form" ng-show="current_tab == <%= tab_count %>">
       <legend ng-if="!editing"><span translate>New <%= name %></span></legend>
       <legend ng-if="editing"><span translate>Edit <%= name %></span></legend><% first = true %>
-      <% fields.each do |field_name, field_type| %><% if tabs[name].include? field_name or tabs[name].include? "__all__" %>
+      <% fields.each do |field_name, field_type| %><% if tab_has_field?(name, field_name) or tabs[name].include? "__all__" %>
 
       <% if first %><div class="row"><% end %>
         <div class="small-4 columns <% if not first %>float-left small-offset-2<% end %>">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faalis
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.3
 platform: ruby
 authors:
 - Sameer Rahmani