knitkit 2.0.0 → 2.0.1

data/app/controllers/knitkit/erp_app/desktop/theme_controller.rb

@@ -34,23 +34,44 @@ module Knitkit
         end
 
         def new
-          unless params[:theme_data].blank?
-            @website.themes.import(params[:theme_data], @website)
-          else
-            theme = Theme.create(:website => @website, :name => params[:name], :theme_id => params[:theme_id])
-            theme.version  = params[:version]
-            theme.author   = params[:author]
-            theme.homepage = params[:homepage]
-            theme.summary  = params[:summary]
-            theme.save
-            theme.create_theme_files!
-          end
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'view', 'Theme') do
+              unless params[:theme_data].blank?
+                @website.themes.import(params[:theme_data], @website)
+              else
+                theme = Theme.create(:website => @website, :name => params[:name], :theme_id => params[:theme_id])
+                theme.version  = params[:version]
+                theme.author   = params[:author]
+                theme.homepage = params[:homepage]
+                theme.summary  = params[:summary]
+                theme.save
+                theme.create_theme_files!
+              end
 
-          render :inline => {:success => true}.to_json
+              render :inline => {:success => true}.to_json
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
+          end
         end
 
         def delete
-          render :json => @theme.destroy ? {:success => true} : {:success => false}
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'view', 'Theme') do
+              if @theme.destroy
+                #clear resolver cache
+                path = File.join("#{@theme[:url]}","templates")
+                cached_resolver = ThemeSupport::Cache.theme_resolvers.find{|cached_resolver| cached_resolver.to_path == path}
+                render :json => {:success => true}
+              else
+                render :json =>  {:success => false}
+              end
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
+          end
         end
 
         def export
@@ -62,11 +83,18 @@ module Knitkit
         end
 
         def change_status
-          #clear active themes
-          @website.deactivate_themes! if (params[:active] == 'true')
-          (params[:active] == 'true') ? @theme.activate! : @theme.deactivate!
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'view', 'Theme') do
+              #clear active themes
+              @website.deactivate_themes! if (params[:active] == 'true')
+              (params[:active] == 'true') ? @theme.activate! : @theme.deactivate!
 
-          render :json => {:success => true}
+              render :json => {:success => true}
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
+          end
         end
 
         ##############################################################
@@ -76,60 +104,94 @@ module Knitkit
         ##############################################################
 
         def create_file
-          path = File.join(@file_support.root,params[:path])
-          name = params[:name]
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'view', 'Theme') do
+              path = File.join(@file_support.root,params[:path])
+              name = params[:name]
 
-          theme = get_theme(path)
-          theme.add_file('#Empty File', File.join(path, name))
+              theme = get_theme(path)
+              theme.add_file('#Empty File', File.join(path, name))
 
-          render :json => {:success => true}
+              render :json => {:success => true}
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
+          end
         end
 
         def create_folder
-          path = File.join(@file_support.root,params[:path])
-          name = params[:name]
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'view', 'Theme') do
+              path = File.join(@file_support.root,params[:path])
+              name = params[:name]
 
-          @file_support.create_folder(path, name)
-          render :json => {:success => true}
+              @file_support.create_folder(path, name)
+              render :json => {:success => true}
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
+          end
         end
 
         def update_file
-          path = File.join(@file_support.root,params[:node])
-          content = params[:content]
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'view', 'Theme') do
+              path = File.join(@file_support.root,params[:node])
+              content = params[:content]
 
-          type = File.extname(File.basename(path)).gsub(/^\.+/, '').to_sym
-          result = Knitkit::SyntaxValidator.validate_content(type, content)
+              type = File.extname(File.basename(path)).gsub(/^\.+/, '').to_sym
+              result = Knitkit::SyntaxValidator.validate_content(type, content)
 
-          unless result
-            @file_support.update_file(path, content)
-            render :json => {:success => true}
-          else
-            render :json => {:success => false, :message => result}
+              unless result
+                @file_support.update_file(path, content)
+                render :json => {:success => true}
+              else
+                render :json => {:success => false, :message => result}
+              end
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
           end
         end
 
         def save_move
-          result          = {}
-          path            = params[:node]
-          new_parent_path = params[:parent_node]
-          new_parent_path = base_path if new_parent_path == ROOT_NODE
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'view', 'Theme') do
+              result          = {}
+              path            = File.join(@file_support.root, params[:node])
+              new_parent_path = File.join(@file_support.root, params[:parent_node])
 
-          unless @file_support.exists? path
-            result = {:success => false, :msg => 'File does not exists'}
-          else
-            theme_file = get_theme_file(path)
-            theme_file.move(new_parent_path)
-            result = {:success => true, :msg => "#{File.basename(path)} was moved to #{new_parent_path} successfully"}
-          end
+              unless @file_support.exists? path
+                result = {:success => false, :msg => 'File does not exist.'}
+              else
+                theme_file = get_theme_file(path)
+                theme_file.move(params[:parent_node])
+                result = {:success => true, :msg => "#{File.basename(path)} was moved to #{new_parent_path} successfully"}
+              end
 
-          render :json => result
+              render :json => result
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
+          end
         end
 
         def download_file
-          path = File.join(@file_support.root,params[:path])
-          contents, message = @file_support.get_contents(path)
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'view', 'Theme') do
+              path = File.join(@file_support.root,params[:path])
+              contents, message = @file_support.get_contents(path)
 
-          send_data contents, :filename => File.basename(path)
+              send_data contents, :filename => File.basename(path)
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
+          end
         end
 
         def get_contents
@@ -144,58 +206,82 @@ module Knitkit
         end
 
         def upload_file
-          result = {}
-          upload_path = request.env['HTTP_EXTRAPOSTDATA_DIRECTORY'].blank? ? params[:directory] : request.env['HTTP_EXTRAPOSTDATA_DIRECTORY']
-          name = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data].original_filename : request.env['HTTP_X_FILE_NAME']
-          data = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data] : request.raw_post
-
-          theme = get_theme(upload_path)
-          name = File.join(@file_support.root, upload_path, name)
-
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
-            theme.add_file(data, name)
-            result = {:success => true}
-          rescue Exception=>ex
-            logger.error ex.message
-            logger.error ex.backtrace.join("\n")
-            result = {:success => false, :error => "Error uploading #{name}"}
-          end
+            current_user.with_capability(model, 'view', 'Theme') do
+              result = {}
+              upload_path = request.env['HTTP_EXTRAPOSTDATA_DIRECTORY'].blank? ? params[:directory] : request.env['HTTP_EXTRAPOSTDATA_DIRECTORY']
+              name = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data].original_filename : request.env['HTTP_X_FILE_NAME']
+              data = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data] : request.raw_post
+
+              theme = get_theme(upload_path)
+              name = File.join(@file_support.root, upload_path, name)
+
+              begin
+                theme.add_file(data, name)
+                result = {:success => true}
+              rescue Exception=>ex
+                logger.error ex.message
+                logger.error ex.backtrace.join("\n")
+                result = {:success => false, :error => "Error uploading #{name}"}
+              end
 
-          render :inline => result.to_json
+              render :inline => result.to_json
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
+          end
         end
 
         def delete_file
-          path = params[:node]
-          result = {}
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
-            name = File.basename(path)
-            result, message, is_folder = @file_support.delete_file(File.join(@file_support.root,path))
-            if result && !is_folder
-              theme_file = get_theme_file(path)
-              theme_file.destroy
+            current_user.with_capability(model, 'view', 'Theme') do
+              path = params[:node]
+              result = {}
+              begin
+                name = File.basename(path)
+                result, message, is_folder = @file_support.delete_file(File.join(@file_support.root,path))
+                if result && !is_folder
+                  theme_file = get_theme_file(path)
+                  theme_file.destroy
+                  #clear resolver cache
+                  path = File.join("#{@theme[:url]}","templates")
+                  cached_resolver = ThemeSupport::Cache.theme_resolvers.find{|cached_resolver| cached_resolver.to_path == path}
+                end
+                result = {:success => result, :error => message}
+              rescue Exception=>ex
+                logger.error ex.message
+                logger.error ex.backtrace.join("\n")
+                result = {:success => false, :error => "Error deleting #{name}"}
+              end
+              render :json => result
             end
-            result = {:success => result, :error => message}
-          rescue Exception=>ex
-            logger.error ex.message
-            logger.error ex.backtrace.join("\n")
-            result = {:success => false, :error => "Error deleting #{name}"}
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
           end
-          render :json => result
         end
 
         def rename_file
-          result = {:success => true, :data => {:success => true}}
-          path = params[:node]
-          name = params[:file_name]
-
-          result, message = @file_support.rename_file(path, name)
-          if result
-            theme_file = get_theme_file(path)
-            theme_file.name = name
-            theme_file.save
-          end
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'view', 'Theme') do
+              result = {:success => true, :data => {:success => true}}
+              path = params[:node]
+              name = params[:file_name]
+
+              result, message = @file_support.rename_file(@file_support.root+path, name)
+              if result
+                theme_file = get_theme_file(path)
+                theme_file.name = name
+                theme_file.save
+              end
 
-          render :json =>  {:success => true, :message => message}
+              render :json =>  {:success => true, :message => message}
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
+          end
         end
 
         protected
@@ -204,19 +290,20 @@ module Knitkit
           sites_index = path.index('sites')
           sites_path  = path[sites_index..path.length]
           site_name   = sites_path.split('/')[1]
-          site        = Website.find(site_name.split('-')[1])
+          site        = Website.find_by_internal_identifier(site_name)
 
           themes_index = path.index('themes')
           path = path[themes_index..path.length]
           theme_name = path.split('/')[1]
-          theme = site.themes.find_by_theme_id(theme_name)
+          @theme = site.themes.find_by_theme_id(theme_name)
 
-          theme
+          @theme
         end
 
         def get_theme_file(path)
           theme = get_theme(path)
-          theme.files.where('name = ? and directory = ?', ::File.basename(path), ::File.dirname(path)).first
+          file_dir = ::File.dirname(path).gsub(Regexp.new(Rails.root.to_s), '')
+          theme.files.where('name = ? and directory = ?', ::File.basename(path), file_dir).first
         end
 
         def setup_tree
@@ -234,16 +321,16 @@ module Knitkit
             }
 
             #handle themes
-            themes_hash = {:text => 'Themes', :contextMenuDisabled => true, :isThemeRoot => true, :siteId => site.id, :children => []}
+            themes_hash = {:text => 'Themes', :contextMenuDisabled => true, :iconCls => 'icon-content', :isThemeRoot => true, :siteId => site.id, :children => []}
             site.themes.each do |theme|
-              theme_hash = {:text => "#{theme.name}[#{theme.theme_id}]", :handleContextMenu => true, :siteId => site.id, :isActive => (theme.active == 1), :isTheme => true, :id => theme.id, :children => []}
+              theme_hash = {:text => "#{theme.name}[#{theme.theme_id}]", :handleContextMenu => true, :siteId => site.id, :isActive => (theme.active == 1), :iconCls => 'icon-content', :isTheme => true, :id => theme.id, :children => []}
               if theme.active == 1
                 theme_hash[:iconCls] = 'icon-add'
               else
                 theme_hash[:iconCls] = 'icon-delete'
               end
               ['stylesheets', 'javascripts', 'images', 'templates', 'widgets'].each do |resource_folder|
-                theme_hash[:children] << {:text => resource_folder, :leaf => false, :id => "/#{theme.url}/#{resource_folder}"}
+                theme_hash[:children] << {:text => resource_folder, :iconCls => 'icon-content', :id => "#{theme.url}/#{resource_folder}"}
               end
               themes_hash[:children] << theme_hash
             end
@@ -263,7 +350,7 @@ module Knitkit
         end
 
         def set_file_support
-          @file_support = ErpTechSvcs::FileSupport::Base.new(:storage => ErpTechSvcs::FileSupport.options[:storage])
+          @file_support = ErpTechSvcs::FileSupport::Base.new(:storage => ErpTechSvcs::Config.file_storage)
         end
   
       end#ThemeController

data/app/controllers/knitkit/erp_app/desktop/versions_controller.rb

@@ -34,11 +34,14 @@ module Knitkit
             def publisher
               published_element.published_by_username if published
             end
+
           end
 
-          render :inline => "{\"totalCount\":#{content.versions.count},data:#{versions.to_json(
-          :only => [:id, :version, :title, :body_html, :excerpt_html, :updated_at],
-          :methods => [:active, :published, :publisher])}}"
+          render :json => {:totalCount => content.versions.count,
+            :data => versions.collect{|version|version.to_hash(
+                :only => [:id, :content_id, :version, :title, :body_html, :excerpt_html, :updated_at],
+                :methods => [:active, :published, :publisher])}
+          }
         end
   
         def non_published_content_versions
@@ -51,23 +54,40 @@ module Knitkit
 
           versions = content.versions.order("#{sort} #{dir}").offset(start).limit(limit)
 
-          render :inline => "{\"totalCount\":#{content.versions.count},data:#{versions.to_json(:only => [:id, :version, :title, :body_html, :excerpt_html, :updated_at])}}"
+          render :json => {:totalCount => content.versions.count,
+            :data => versions.collect{|version|version.to_hash(
+                :only => [:id, :version, :title, :body_html, :excerpt_html, :updated_at])}
+          }
         end
 
         def publish_content
-          content = Content.find(Content::Version.find(params[:id]).content_id)
-          content.publish(Website.find(params[:site_id]), params[:comment], params[:version], current_user)
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'publish', 'Article') do
+              content = Content.find(Content::Version.find(params[:id]).content_id)
+              content.publish(Website.find(params[:site_id]), params[:comment], params[:version], current_user)
 
-          render :json => {:success => true}
+              render :json => {:success => true}
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
+          end
         end
 
         def revert_content
-          content = Content.find(Content::Version.find(params[:id]).content_id)
-          version = params[:version]
-          content.revert_to(version)
-          content.save!
-
-          render :json => {:success => true}
+          model = DesktopApplication.find_by_internal_identifier('knitkit')
+          begin
+            current_user.with_capability(model, 'revert_version', 'Article') do
+              content = Content.find(Content::Version.find(params[:id]).content_id)
+              version = params[:version]
+              content.revert_to(version)
+              content.save!
+
+              render :json => {:success => true}
+            end
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+            render :json => {:success => false, :message => ex.message}
+          end
         end
 
         #website section layouts
@@ -104,9 +124,11 @@ module Knitkit
             end
           end
 
-          render :inline => "{\"totalCount\":#{website_section.versions.count},data:#{versions.to_json(
-          :only => [:id, :version, :title, :updated_at],
-          :methods => [:active, :published, :publisher])}}"
+          render :json => {:totalCount => website_section.versions.count,
+            :data => versions.collect{|version|version.to_hash(
+                :only => [:id, :version, :title, :updated_at],
+                :methods => [:active, :published, :publisher])}
+          }
         end
 
         def get_website_section_version