knitkit 2.1.0 → 2.1.1

data/lib/knitkit/extensions/action_controller/theme_support/acts_as_themed_controller.rb

@@ -29,7 +29,7 @@ module Knitkit
           module InstanceMethods
             def current_themes
               # the lambda broke in rails 3.2, changing this to an instance variable
-              @current_themes ||= self.website.themes.collect{|t| t if t.active } rescue []
+              @current_themes ||= self.website.themes.collect{|t| t if t.active == 1}.compact rescue []
               # @current_themes ||= case accessor = self.class.read_inheritable_attribute(:current_themes)
               # when Symbol then accessor == :current_themes ? raise("screwed") : send(accessor)
               # when Proc   then accessor.call(self)

data/lib/knitkit/extensions/railties/action_view/helpers/menu_helper.rb

@@ -6,11 +6,10 @@ module Knitkit
           module MenuHelper
 
             def menu_item_selected(menu_item)
-              result = false
-              result = request.path == menu_item.path
+              result = request.env['REQUEST_PATH'] == menu_item.path
               unless result
                 menu_item.descendants.each do |child|
-                  result = request.path == child.path
+                  result = request.env['REQUEST_PATH'] == child.path
                   break if result
                 end
               end

data/lib/knitkit/version.rb

@@ -2,7 +2,7 @@ module Knitkit
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/public/javascripts/erp_app/desktop/applications/knitkit/center_region.js

@@ -93,6 +93,11 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                         title:sectionName + ' - Layout',
                         tbarItems:tbarItems,
                         disableSave:true,
+                        listeners:{
+                            save:function (comp, content) {
+                                self.saveSectionLayout(websiteSectionId, content);
+                            }
+                        },
                         xtype:'codemirror',
                         parser:'erb',
                         region:'center',
@@ -168,6 +173,11 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                         tbarItems:tbarItems,
                         disableSave:true,
                         xtype:'codemirror',
+                        listeners:{
+                            save:function (comp, content) {
+                                self.saveTemplateFile(node.data.id, content);
+                            }
+                        },
                         parser:fileType,
                         sourceCode:content
                     }
@@ -227,6 +237,13 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 ckEditorConfig:{
                     extraPlugins:'jwplayer',
                     toolbar:self.ckEditorToolbar
+                },
+                listeners:{
+                    save:function (comp, content) {
+                        self.saveExcerpt(id, content, siteId);
+                        if (contentGridStore)
+                            contentGridStore.load();
+                    }
                 }
             });
 
@@ -393,6 +410,13 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 ckEditorConfig:{
                     extraPlugins:'jwplayer',
                     toolbar:self.ckEditorToolbar
+                },
+                listeners:{
+                    save:function (comp, content) {
+                        self.saveContent(id, content, contentType, siteId);
+                        if (contentGridStore)
+                            contentGridStore.load();
+                    }
                 }
             });
 
@@ -439,7 +463,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.Knitkit.CenterRegion", {
                 closable:true,
                 items:items,
                 save:function (comp) {
-                    if (currentUser.hasCapability('edit_html','Content')) {
+                    if (currentUser.hasCapability('edit_html', 'Content')) {
                         var content = comp.down('ckeditor').getValue();
                         self.saveContent(id, content, contentType, siteId);
                         if (contentGridStore) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knitkit
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_forms
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +239,16 @@ files:
 - app/widgets/contact_us/views/index.html.erb
 - app/widgets/contact_us/views/layouts/base.html.erb
 - app/widgets/contact_us/views/success.html.erb
+- app/widgets/dynamic_forms/base.rb
+- app/widgets/dynamic_forms/javascript/dynamic_forms.js
+- app/widgets/dynamic_forms/views/error.html.erb
+- app/widgets/dynamic_forms/views/index.html.erb
+- app/widgets/dynamic_forms/views/success.html.erb
+- app/widgets/dynamic_grid/base.rb
+- app/widgets/dynamic_grid/helpers/controller/dynamic_grid_controller_helper.rb
+- app/widgets/dynamic_grid/helpers/view/dynamic_grid_view_helper.rb
+- app/widgets/dynamic_grid/javascript/dynamic_grid.js
+- app/widgets/dynamic_grid/views/index.html.erb
 - app/widgets/google_map/base.rb
 - app/widgets/google_map/javascript/google_map.js
 - app/widgets/google_map/views/index.html.erb
@@ -260,6 +270,11 @@ files:
 - app/widgets/reset_password/javascript/reset_password.js
 - app/widgets/reset_password/views/index.html.erb
 - app/widgets/reset_password/views/layouts/base.html.erb
+- app/widgets/scaffold/base.rb
+- app/widgets/scaffold/helpers/controller/scaffold_controller_helper.rb
+- app/widgets/scaffold/helpers/view/scaffold_view_helper.rb
+- app/widgets/scaffold/javascript/scaffold.js
+- app/widgets/scaffold/views/index.html.erb
 - app/widgets/search/base.rb
 - app/widgets/search/javascript/search.js
 - app/widgets/search/views/_search.html.erb
@@ -433,18 +448,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2635721742671855384
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2635721742671855384
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24