knitkit 3.0.0 → 3.2.0

data/app/assets/stylesheets/knitkit/submenu.css

@@ -0,0 +1,93 @@
+/*!
+ * Start Bootstrap - Simple Sidebar HTML Template (http://startbootstrap.com)
+ * Code licensed under the Apache License v2.0.
+ * For details, see http://www.apache.org/licenses/LICENSE-2.0.
+ */
+
+/* Toggle Styles */
+
+
+#sidebar-wrapper {
+    z-index: 1000;
+    position: fixed;
+    left: 250px;
+    width: 0;
+    height: 100%;
+    margin-left: -250px;
+    overflow-y: auto;
+    background: #222;
+    -webkit-transition: all 0.5s ease;
+    -moz-transition: all 0.5s ease;
+    -o-transition: all 0.5s ease;
+    transition: all 0.5s ease;
+}
+
+/* Sidebar Styles */
+
+.sidebar-nav {
+    position: absolute;
+    top: 0;
+    width: 10px;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+.sidebar-nav li {
+    text-indent: 20px;
+    line-height: 40px;
+}
+
+.sidebar-nav .active {
+    background-color: #525050;
+}
+
+.sidebar-nav .active a {
+    color: white;
+}
+
+.sidebar-nav li a {
+    display: block;
+    text-decoration: none;
+    color: #999999;
+}
+
+.sidebar-nav li a:hover {
+    text-decoration: none;
+    color: #fff;
+    background: rgba(255,255,255,0.2);
+}
+
+.sidebar-nav li a:active,
+.sidebar-nav li a:focus {
+    text-decoration: none;
+}
+
+.sidebar-nav > .sidebar-brand {
+    height: 65px;
+    font-size: 18px;
+    line-height: 60px;
+}
+
+.sidebar-nav > .sidebar-brand a {
+    color: #999999;
+}
+
+.sidebar-nav > .sidebar-brand a:hover {
+    color: #fff;
+    background: none;
+}
+
+@media(min-width:768px) {
+    .sidebar-nav {
+        width: 250px;
+    }
+
+    .side-bar-content-wrapper {
+        margin-left: 250px !important;
+    }
+
+    #sidebar-wrapper {
+        width: 250px;
+    }
+}

data/app/controllers/api/v1/websites_controller.rb

@@ -0,0 +1,14 @@
+module Api
+  module V1
+    class WebsitesController < BaseController
+
+      def index
+        render json: {
+                   success: true,
+                   websites: Website.scope_by_dba_organization(current_user.party.dba_organization).all.collect { |w| w.to_data_hash }
+               }
+      end
+
+    end # WebsitesController
+  end # V1
+end # Api

data/app/controllers/captcha_controller.rb

@@ -0,0 +1,53 @@
+class CaptchaController < ActionController::Base
+
+  include Knitkit::Extensions::Railties::ActionController::CaptchaHelper
+
+  before_filter :setup_visual_captcha
+
+  def setup_visual_captcha
+  	@session = VisualCaptcha::Session.new session
+  	@headers = {
+        'Access-Control-Allow-Origin' => '*'
+    }
+  end
+
+  def start
+  	captcha = VisualCaptcha::Captcha.new @session
+
+    captcha.generate params[:how_many]
+
+    render json: captcha.frontend_data
+  end
+
+  def audio
+  	captcha = VisualCaptcha::Captcha.new @session
+
+    type = params[:type]
+    type = 'mp3' if type != 'ogg'
+
+    if (body = captcha.stream_audio @headers, type)
+      send_data body, type: type, disposition: 'inline'
+    else
+      raise ActionController::RoutingError.new('Not Found')
+    end
+  end
+
+  def image
+  	captcha = VisualCaptcha::Captcha.new @session
+
+    if (body = captcha.stream_image @headers, params[:index], params[:retina])
+      send_data body, type: 'image/png', disposition: 'inline'
+    else
+      raise ActionController::RoutingError.new('Not Found')
+    end
+  end
+
+  def validate
+    if captcha_valid?
+      render json: {success: true}
+    else
+      render json: {success: false}
+    end
+  end
+
+end

data/app/controllers/knitkit/base_controller.rb

@@ -1,6 +1,6 @@
 module Knitkit
   class BaseController < ::ErpApp::ApplicationController
-    before_filter :set_website, :clear_widget_params
+    before_filter :set_website
     before_filter :set_login_path, :set_active_publication, :load_sections, :set_section, :except => [:view_current_publication]
     acts_as_themed_controller 
 
@@ -23,10 +23,6 @@ module Knitkit
     def load_sections
       @website_sections = @website.website_sections.positioned
     end
-
-    def clear_widget_params
-      session[:widgets] = {}
-    end
     
     def set_section
       unless params[:section_id].nil?

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

@@ -4,10 +4,6 @@ module Knitkit
       class AppController < ::ErpApp::Desktop::BaseController
         KNIT_KIT_ROOT = Knitkit::Engine.root.to_s
 
-        def available_roles
-          render :json => {:success => true, :availableRoles => SecurityRole.order('description ASC').all.collect { |role| role.to_hash(:only => [:internal_identifier, :description]) }}
-        end
-
         protected
 
         def set_website
@@ -72,10 +68,8 @@ module Knitkit
               :inMenu => website_section.in_menu,
               :renderWithBaseLayout => website_section.render_base_layout?,
               :hasLayout => !website_section.layout.blank?,
-              :id => "section_#{website_section.id}",
-              :url => "http://#{@website_primary_host}#{website_section.path}",
+              :url => "#{request.protocol}#{@website_primary_host}#{website_section.path}",
               :internal_identifier => website_section.internal_identifier
-
           }
 
           if website_section.is_a?(OnlineDocumentSection) || website_section.type == 'OnlineDocumentSection'
@@ -108,9 +102,8 @@ module Knitkit
 
           {
               recordType: 'Article',
-              recordId: website_section_content.id,
+              recordId: website_section_content.content.id,
               :objectType => "Article",
-              :id => content.id,
               :siteId => website.id,
               :content_area => website_section_content.content_area,
               :parentItemId => website_section.id,

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

@@ -19,6 +19,9 @@ module Knitkit
                 article.created_by = current_user
 
                 if article.save
+                  # set the currents users dba_org as the dba_org for this content
+                  article.add_party_with_role(current_user.party.dba_organization, RoleType.iid('dba_org'))
+
                   result[:node] = if website_section_id.blank?
                                     {:text => params[:title],
                                      :id => article.id,
@@ -31,9 +34,13 @@ module Knitkit
                                   else
                                     website_section = WebsiteSection.find(website_section_id)
                                     article.website_sections << website_section
-                                    website_section_content = article.update_content_area_and_position_by_section(website_section, params['content_area'], params['position'])
+                                    website_section_content = article.update_content_area_and_position_by_section(website_section,
+                                                                                                                  params['content_area'],
+                                                                                                                  params['position'])
 
-                                    build_article_hash(website_section_content, website_section.website, website_section.is_blog?)
+                                    build_article_hash(website_section_content,
+                                                       website_section.website,
+                                                       website_section.is_blog?)
                                   end
 
                   result[:success] = true
@@ -65,7 +72,9 @@ module Knitkit
               if article.save
                 unless website_section_id.blank?
                   website_section = WebsiteSection.find(website_section_id)
-                  article.update_content_area_and_position_by_section(website_section, params['content_area'], params['position'])
+                  article.update_content_area_and_position_by_section(website_section,
+                                                                      params['content_area'],
+                                                                      params['position'])
                 end
 
                 result[:success] = true
@@ -107,7 +116,8 @@ module Knitkit
         end
 
         def existing_articles
-          render :inline => Article.all.to_json(:only => [:internal_identifier, :id])
+          render :inline => Article.with_party_role(current_user.party.dba_organization,
+                                                    RoleType.iid('dba_org')).all.to_json(:only => [:internal_identifier, :id])
         end
 
         def show
@@ -133,7 +143,8 @@ module Knitkit
           limit = params[:limit] || 10
           start = params[:start] || 0
 
-          articles = Article.joins("INNER JOIN website_section_contents ON website_section_contents.content_id = contents.id").where("website_section_id = #{website_section_id}")
+          articles = Article.joins("INNER JOIN website_section_contents ON website_section_contents.content_id = contents.id")
+                         .where("website_section_id = #{website_section_id}")
           total_count = articles.count
           articles = articles.order("#{sort} #{dir}").limit(limit).offset(start)
 
@@ -171,7 +182,9 @@ module Knitkit
           limit = params[:limit] || 20
           start = params[:start] || 0
 
-          articles = Article.includes(:website_section_contents)
+          articles = Article.with_party_role(current_user.party.dba_organization,
+                                             RoleType.iid('dba_org')).includes(:website_section_contents)
+
           articles = articles.where(:website_section_contents => {:content_id => nil}) if params[:show_orphaned] == 'true'
           articles = articles.where("UPPER(contents.internal_identifier) LIKE UPPER('%#{params[:iid]}%')") unless params[:iid].blank?
           articles = articles.where("UPPER(contents.title) LIKE UPPER('%#{params[:title]}%')") unless params[:title].blank?
@@ -201,7 +214,7 @@ module Knitkit
             articles_array << articles_hash
           end
 
-          render :inline => "{total:#{total_count},data:#{articles_array.to_json}}"
+          render :json => {total: total_count, data: articles_array}
         end
 
         def article_attributes

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

@@ -7,11 +7,11 @@ module Knitkit
         before_filter :set_asset_model
         before_filter :set_root_node
 
-        def base_path          
+        def base_path
           if @root_node.nil?
             @base_path = nil
           else
-            @base_path = File.join(@file_support.root, @root_node) 
+            @base_path = File.join(@file_support.root, @root_node)
           end
 
           @base_path
@@ -32,17 +32,18 @@ module Knitkit
 
           @assets_model.add_file('#Empty File', File.join(path, name))
 
-          render :json => {:success => true}
+          render :json => {:success => true, :node => @file_support.find_node(File.join(path, name), :file_asset_holder => @assets_model)}
         end
 
         def create_folder
           path = (params[:path] == 'root_node') ? base_path : params[:path]
           name = params[:name]
 
-          path = File.join(@file_support.root,path) if path.index(@file_support.root).nil?
+          path = File.join(@file_support.root, path) if path.index(@file_support.root).nil?
 
           @file_support.create_folder(path, name)
-          render :json => {:success => true}
+
+          render :json => {:success => true, :node => @file_support.find_node(File.join(path, name), {keep_full_path: false})}
         end
 
         def upload_file
@@ -55,7 +56,6 @@ module Knitkit
             capability_resource = "GlobalFileAsset"
           end
 
-          model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
             current_user.with_capability(capability_type, capability_resource) do
               result = {}
@@ -64,8 +64,10 @@ module Knitkit
               data = request.raw_post
 
               begin
-                upload_path == 'root_node' ? @assets_model.add_file(data, File.join(base_path,name)) : @assets_model.add_file(data, File.join(@file_support.root,upload_path,name))
-                result = {:success => true}
+                path = (upload_path == 'root_node') ? File.join(base_path, name) : File.join(@file_support.root, upload_path, name)
+
+                @assets_model.add_file(data, path)
+                result = {:success => true, :node => @file_support.find_node(path, :file_asset_holder => @assets_model)}
               rescue => ex
                 logger.error ex.message
                 logger.error ex.backtrace.join("\n")
@@ -75,7 +77,7 @@ module Knitkit
               #the awesome uploader widget whats this to mime type text, leave it render :inline
               render :inline => result.to_json
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -86,7 +88,7 @@ module Knitkit
           path = params[:node]
           new_parent_path = params[:parent_node]
           new_parent_path = @root_node if new_parent_path == ROOT_NODE
-          
+
           nodes_to_move = (params[:selected_nodes] ? JSON(params[:selected_nodes]) : [params[:node]])
           begin
             nodes_to_move.each do |path|
@@ -100,7 +102,7 @@ module Knitkit
             end
             render :json => {:success => true, :msg => messages.join(',')}
           rescue Exception => e
-           render :json => {:success => false, :msg => e.message}
+            render :json => {:success => false, :msg => e.message}
           end
         end
 
@@ -121,18 +123,21 @@ module Knitkit
             result = false
             nodes_to_delete.each do |path|
               current_user.with_capability(capability_type, capability_resource) do
-                path = "#{path}/" if params[:leaf] == 'false' and path.match(/\/$/).nil?                
+                path = "#{path}/" if params[:leaf] == 'false' and path.match(/\/$/).nil?
                 begin
                   name = File.basename(path)
-                  result, message, is_folder = @file_support.delete_file(File.join(@file_support.root,path))
+                  result, message, is_folder = @file_support.delete_file(File.join(@file_support.root, path))
                   if result and !is_folder
                     file = @assets_model.files.find(:first, :conditions => ['name = ? and directory = ?', ::File.basename(path), ::File.dirname(path)])
                     file.destroy
                   end
                   messages << message
-                rescue Exception=>ex
+                rescue StandardError => ex
                   Rails.logger.error ex.message
                   Rails.logger.error ex.backtrace.join("\n")
+
+                  ExceptionNotifier.notify_exception(ex) if defined? ExceptionNotifier
+
                   render :json => {:success => false, :error => "Error deleting #{name}"} and return
                 end
               end # end current_user.with_capability
@@ -142,7 +147,7 @@ module Knitkit
             else
               render :json => {:success => false, :error => messages.join(',')}
             end
-          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability=>ex
+          rescue ErpTechSvcs::Utils::CompassAccessNegotiator::Errors::UserDoesNotHaveCapability => ex
             render :json => {:success => false, :message => ex.message}
           end
         end
@@ -151,18 +156,18 @@ module Knitkit
           path = params[:node]
           name = params[:file_name]
 
-          result, message = @file_support.rename_file(File.join(@file_support.root,path), name)
+          result, message = @file_support.rename_file(File.join(@file_support.root, path), name)
           if result
             file = @assets_model.files.find(:first, :conditions => ['name = ? and directory = ?', ::File.basename(path), ::File.dirname(path)])
             file.name = name
             file.save
           end
 
-          render :json =>  {:success => true, :message => message}
+          render :json => {:success => true, :message => message}
         end
 
         def update_security
-          path   = params[:path]
+          path = params[:path]
           secure = params[:secure]
           roles = []
 
@@ -185,11 +190,11 @@ module Knitkit
               role.add_capability(capability)
             end
           end
-          
+
           # if we're using S3, set file permissions to private or public_read   
           @file_support.set_permissions(path, (file.is_secured? ? :private : :public_read)) if ErpTechSvcs::Config.file_storage == :s3
-          
-          render :json => {:success => true, :secured => file.is_secured?, :roles => file.roles.uniq.collect{|item| item.internal_identifier}}
+
+          render :json => {:success => true, :secured => file.is_secured?, :roles => file.roles.uniq.collect { |item| item.internal_identifier }}
         end
 
         protected
@@ -202,9 +207,14 @@ module Knitkit
           @root_node = nil
 
           if @context == :website
-            @root_node = File.join(ErpTechSvcs::Config.file_assets_location,"sites",@assets_model.iid) unless @assets_model.nil?
+            @root_node = File.join(ErpTechSvcs::Config.file_assets_location,
+                                   'sites',
+                                   @assets_model.iid)
           else
-            @root_node = File.join(ErpTechSvcs::Config.file_assets_location,"shared_site_files")
+            @root_node = File.join(ErpTechSvcs::Config.file_assets_location,
+                                   "dba_organizations",
+                                   current_user.party.dba_organization.id.to_s,
+                                   "shared_site_files")
           end
 
           @root_node
@@ -222,8 +232,8 @@ module Knitkit
             @assets_model = CompassAeInstance.find_by_internal_identifier('base')
           end
         end
-  
-      end#FileAssetsController
-    end#Desktop
-  end#ErpApp
-end#Knitkit
+
+      end #FileAssetsController
+    end #Desktop
+  end #ErpApp
+end #Knitkit