knitkit 3.0.0 → 3.2.0

data/app/widgets/search/views/layouts/base.html.erb

@@ -11,4 +11,9 @@
      # per_page: Number of results per page
   %>
   <%= render_widget :search %>
-</div>
+</div>
+
+
+
+
+

data/app/widgets/signup/base.rb

@@ -1,6 +1,7 @@
 module Widgets
   module Signup
     class Base < ErpApp::Widgets::Base
+
       def index
         @login_url = params[:login_url]
         @user = User.new
@@ -13,28 +14,66 @@ module Widgets
         @configuration = @website.configurations.first
         password_config_option = @configuration.get_item(ConfigurationItemType.find_by_internal_identifier('password_strength_regex')).options.first
         primary_host = @configuration.get_item(ConfigurationItemType.find_by_internal_identifier('primary_host')).options.first
-
         @email = params[:email]
-        @user = User.new(
-          :email => @email,
-          :username => params[:username],
-          :password => params[:password],
-          :password_confirmation => params[:password_confirmation]
-        )
-        @user.password_validator = {:regex => password_config_option.value, :error_message => password_config_option.comment}
-        #set this to tell activation where to redirect_to for login and temp password
-        @user.add_instance_attribute(:login_url,params[:login_url])
-        @user.add_instance_attribute(:temp_password, params[:password])
-        @user.add_instance_attribute(:domain, primary_host.value)
+
         begin
-          if @user.save
-            individual = Individual.create(:current_first_name => params[:first_name], :current_last_name => params[:last_name])
-            @user.party = individual.party
-            @user.add_role(@website.role)
-            @user.save
-            render :update => {:id => "#{@uuid}_result", :view => :success}
-          else
-            render :update => {:id => "#{@uuid}_result", :view => :error}
+          ActiveRecord::Base.transaction do
+            @user = User.new(
+              :email => @email,
+              :username => params[:username],
+              :password => params[:password],
+              :password_confirmation => params[:password_confirmation]
+            )
+            @user.password_validator = {:regex => password_config_option.value, :error_message => password_config_option.comment}
+            #set this to tell activation where to redirect_to for login and temp password
+            @user.add_instance_attribute(:login_url, params[:login_url])
+            @user.add_instance_attribute(:domain, primary_host.value)
+
+            if @user.save
+
+              # check if there is already a party with that email if there is tie the party to the user
+              party = Party.find_by_email(@email, 'billing')
+              if party
+                @user.party = party
+              else
+                individual = Individual.create(:current_first_name => params[:first_name], :current_last_name => params[:last_name])
+                @user.party = individual.party
+              end
+
+              # add website security role to user
+              @user.add_role(@website.role)
+
+              # create website_party_role for this user as a member of the site
+              WebsitePartyRole.create(party: @user.party, website: @website, role_type: RoleType.find_by_ancestor_iids(['website', 'member']))
+
+              @user.save
+              party = @user.party
+
+              # add party roles to party if present
+              unless params[:party_roles].blank?
+                params[:party_roles].split(',').each do |role_type|
+                  party.add_role_type(role_type)
+                end
+
+                party.save
+              end
+
+              # associate the new party to the dba_organization of the current website
+              @dba_party = @website.website_party_roles.where('role_type_id' => RoleType.iid('dba_org')).first.party
+              party.party_roles.collect(&:role_type).each do |role_type|
+                relationship_type = RelationshipType.find_or_create(RoleType.iid('dba_org'), role_type)
+
+                party.create_relationship(relationship_type.description,
+                                          @dba_party.id,
+                                          relationship_type)
+              end
+
+              after_registration
+
+              render :update => {:id => "#{@uuid}_result", :view => :success}
+            else
+              render :update => {:id => "#{@uuid}_result", :view => :error}
+            end
           end
         rescue => ex
           logger.error ex.message
@@ -43,32 +82,36 @@ module Widgets
         end
       end
 
-      #should not be modified
-      #modify at your own risk
+      def after_registration
+        # override in your code to do special registration logic
+      end
+
+      # should not be modified
+      # modify at your own risk
       def locate
         File.dirname(__FILE__)
       end
-        
+
       class << self
         def title
           "Sign Up"
         end
-          
+
         def widget_name
           File.basename(File.dirname(__FILE__))
         end
-          
+
         def base_layout
           begin
-            file = File.join(File.dirname(__FILE__),"/views/layouts/base.html.erb")
+            file = File.join(File.dirname(__FILE__), "/views/layouts/base.html.erb")
             IO.read(file)
           rescue
             return nil
           end
         end
+
       end
-        
-    end
-  end
-end
 
+    end # Base
+  end # Signup
+end # Widgets

data/app/widgets/signup/javascript/signup.js

@@ -7,7 +7,7 @@ Compass.ErpApp.Widgets.Signup = {
 
 Compass.ErpApp.Widgets.AvailableWidgets.push({
     name: 'Signup',
-    iconUrl: '/images/icons/sign_up/sign_up_48x48.png',
+    iconUrl: '/assets/icons/sign_up/sign_up_48x48.png',
     onClick: Compass.ErpApp.Widgets.Signup.addSignup,
     about: 'This widget allows users to sign up.'
 });

data/app/widgets/signup/views/_signup_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_remote_tag build_widget_url(:new), :class => "form-signin", :style => 'max-width: 500px;' do %>
+<%= form_remote_tag build_widget_url(:new), :class => "form-signin" do %>
     <div class="form_settings">
 
       <div class="form-group">
@@ -23,6 +23,7 @@
       <div class="form-group">
         <label for="password">Enter a password</label>
         <%= password_field_tag :password, nil, :class => "form-control", :placeholder => "", :required => true %>
+        <span>Password must be between 8 and 20 characters with no spaces</span>
       </div>
 
       <div class="form-group">

data/app/widgets/signup/views/layouts/base.html.erb

@@ -3,7 +3,7 @@
     <div class="col-md-6 col-md-offset-3" style="margin: 0 auto;float:none;">
       <h2><%= @website_section.title %></h2>
 
-      <%= render_widget :signup, :params => {:login_url => "/login"} %>
+      <%= render_widget :signup, :params => {:login_url => "/login", :party_roles => 'customer'} %>
 
     </div>
   </div>

data/app/widgets/signup/views/success.html.erb

@@ -1,5 +1,4 @@
 <div class="alert alert-success">
-  <h2>Sign up Successful</h2>
-
-  <p>You will receive an email at <%= @email %> to activate your account</p>
+  <h2>Success</h2>
 </div>
+<p>You will receive an email at <%= @email %> to activate your account</p>

data/config/routes.rb

@@ -4,7 +4,7 @@ Rails.application.routes.draw do
   get 'knitkit_mobile' => 'knitkit/mobile#index'
   match 'pages/:section_id' => 'knitkit/website_sections#index', :as => 'page'
   get 'onlinedocumentsections/:section_id' => 'knitkit/online_document_sections#index', :as => 'document'
-  #get 'onlinedocumentsections/:section_id/:id' => 'knitkit/online_document_sections#show', :as => 'document'
+  get 'onlinedocumentsections/:section_id/show' => 'knitkit/online_document_sections#show'
   get 'blogs/:section_id(.:format)' => 'knitkit/blogs#index', :as => 'blogs'
   get 'blogs/:section_id/:id' => 'knitkit/blogs#show', :as => 'blog_article'
   get 'blogs/:section_id/tag/:tag_id(.:format)' => 'knitkit/blogs#tag', :as => 'blog_tag'
@@ -13,6 +13,20 @@ Rails.application.routes.draw do
   match '/unauthorized' => 'knitkit/unauthorized#index', :as => 'knitkit/unauthorized'
   match '/view_current_publication' => 'knitkit/base#view_current_publication'
   match '/online_document_sections(/:action)' => 'knitkit/online_document_sections'
+
+  namespace :api do
+    namespace :v1 do
+
+      resources :websites, defaults: { :format => 'json' }
+
+    end
+  end
+
+  get '/captcha/start/:how_many' => 'captcha#start'
+  get '/captcha/audio(/:type)' => 'captcha#audio'
+  get '/captcha/image/:index' => 'captcha#image'
+  put '/captcha/validate' => 'captcha#validate'
+
 end
 
 Knitkit::Engine.routes.draw do
@@ -25,10 +39,19 @@ Knitkit::Engine.routes.draw do
       resources :website_nav
       resources :website_nav_item do
         member do
-          post :update_security
+          put :update_security
         end
       end
       resources :website_host
+      resources :online_document_sections do
+        collection do
+          post :copy
+          get :existing_documents
+        end
+        member do
+          get :content
+        end
+      end
 
       match '/:action' => 'app'
       match '/image_assets/:context/:action' => 'image_assets'
@@ -41,8 +64,6 @@ Knitkit::Engine.routes.draw do
       match '/site(/:action)' => 'website'
       #section
       match '/section/:action' => 'website_section'
-      #document
-      match '/online_document_sections/:action' => 'online_document_sections'
       #theme
       match '/theme/:action' => 'theme'
       #version

data/db/data_migrations/20110509223702_add_publisher_role.rb

@@ -4,7 +4,6 @@ class AddPublisherRole
     SecurityRole.create(:internal_identifier => 'publisher', :description => 'Publisher')
     SecurityRole.create(:internal_identifier => 'content_author', :description => 'Content Author')
     SecurityRole.create(:internal_identifier => 'layout_author', :description => 'Layout Author')
-    SecurityRole.create(:internal_identifier => 'editor', :description => 'Editor')
     SecurityRole.create(:internal_identifier => 'designer', :description => 'Designer')
     SecurityRole.create(:internal_identifier => 'website_author', :description => 'Website Author')
   end
@@ -13,7 +12,6 @@ class AddPublisherRole
     SecurityRole.iid('publisher').destroy
     SecurityRole.iid('content_author').destroy
     SecurityRole.iid('layout_author').destroy
-    SecurityRole.iid('editor').destroy
     SecurityRole.iid('designer').destroy
     SecurityRole.iid('website_author').destroy
   end

data/db/data_migrations/20110816153456_add_knitkit_application.rb

@@ -1,29 +1,21 @@
 class AddKnitkitApplication
-  
+
   def self.up
     if DesktopApplication.find_by_internal_identifier('knitkit').nil?
-      knikit_app = DesktopApplication.create(
+      app = DesktopApplication.create(
         :description => 'KnitKit',
         :icon => 'icon-palette',
-        :javascript_class_name => 'Compass.ErpApp.Desktop.Applications.Knitkit',
-        :internal_identifier => 'knitkit',
-        :shortcut_id => 'knitkit-win'
+        :internal_identifier => 'knitkit'
       )
 
-      knikit_app.preference_types << PreferenceType.iid('desktop_shortcut')
-      knikit_app.preference_types << PreferenceType.iid('autoload_application')
-      knikit_app.save
-    
       admin_user = User.find_by_username('admin')
-      admin_user.desktop.applications << knikit_app
+      admin_user.desktop_applications << app
       admin_user.save
-    
-      truenorth_user = User.find_by_username('truenorth')
-      truenorth_user.desktop.applications << knikit_app
-      truenorth_user.save
+
+      app.add_party_with_role(admin_user.party.dba_organization, RoleType.iid('dba_org'))
     end
   end
-  
+
   def self.down
     DesktopApplication.find_by_internal_identifier('knitkit').destroy
   end

data/db/data_migrations/20120127150505_create_website_default_configuration.rb

@@ -3,6 +3,21 @@ class CreateWebsiteDefaultConfiguration
   def self.up
     unless ::Configuration.find_template('default_website_configuration')
       website_setup_category = Category.create(:description => 'Website Setup', :internal_identifier => 'website_setup')
+      content_work_flow_category = Category.create(:description => 'Content Workflow', :internal_identifier => 'content_workflow')
+
+      yes_option = ConfigurationOption.find_by_internal_identifier('yes')
+      yes_option = ConfigurationOption.create(
+          :description => 'Yes',
+          :internal_identifier => 'yes',
+          :value => 'yes'
+      ) if yes_option.nil?
+
+      no_option = ConfigurationOption.find_by_internal_identifier('no')
+      no_option = ConfigurationOption.create(
+          :description => 'No',
+          :internal_identifier => 'no',
+          :value => 'no'
+      ) if no_option.nil?
 
       #configuration
       configuration = Configuration.create(
@@ -11,6 +26,7 @@ class CreateWebsiteDefaultConfiguration
         :is_template => true
       )
 
+      # login url
       login_url_config_item_type = ConfigurationItemType.create(
         :description => 'Login Url',
         :internal_identifier => 'login_url',
@@ -19,6 +35,16 @@ class CreateWebsiteDefaultConfiguration
       CategoryClassification.create(:category => website_setup_category, :classification => login_url_config_item_type)
       configuration.configuration_item_types << login_url_config_item_type
 
+      # primary host
+      primary_host_config_item_type = ConfigurationItemType.create(
+          :description => 'Primary Host',
+          :internal_identifier => 'primary_host',
+          :allow_user_defined_options => true
+      )
+      CategoryClassification.create(:category => website_setup_category, :classification => primary_host_config_item_type)
+      configuration.configuration_item_types << primary_host_config_item_type
+
+      # homepage url
       home_page_url_config_item_type = ConfigurationItemType.create(
         :description => 'Homepage Url',
         :internal_identifier => 'homepage_url',
@@ -27,6 +53,7 @@ class CreateWebsiteDefaultConfiguration
       CategoryClassification.create(:category => website_setup_category, :classification => home_page_url_config_item_type)
       configuration.configuration_item_types << home_page_url_config_item_type
 
+      # contact us email
       contact_us_email_address_item_type = ConfigurationItemType.create(
         :description => 'Contact Us Email',
         :internal_identifier => 'contact_us_email_address',
@@ -34,13 +61,46 @@ class CreateWebsiteDefaultConfiguration
       )
       CategoryClassification.create(:category => website_setup_category, :classification => contact_us_email_address_item_type)
       configuration.configuration_item_types << contact_us_email_address_item_type
-    
+
+      #add email inquiries config
+      email_inquiries_config_item_type = ConfigurationItemType.create(
+          :description => 'Email inquiries',
+          :internal_identifier => 'email_inquiries'
+      )
+      email_inquiries_config_item_type.configuration_options << yes_option
+      email_inquiries_config_item_type.add_default_option(no_option)
+      CategoryClassification.create(:category => website_setup_category, :classification => email_inquiries_config_item_type)
+
+      configuration.configuration_item_types << email_inquiries_config_item_type
+
+      #add auto activate publications
+      auto_activate_config_item_type = ConfigurationItemType.create(
+          :description => 'Auto activate publications',
+          :internal_identifier => 'auto_active_publications'
+      )
+      auto_activate_config_item_type.configuration_options << no_option
+      auto_activate_config_item_type.add_default_option(yes_option)
+      CategoryClassification.create(:category => content_work_flow_category, :classification => auto_activate_config_item_type)
+
+      configuration.configuration_item_types << auto_activate_config_item_type
+
+      #add auto publish on save
+      publish_on_save_config_item_type = ConfigurationItemType.create(
+          :description => 'Publish on save',
+          :internal_identifier => 'publish_on_save'
+      )
+      publish_on_save_config_item_type.configuration_options << no_option
+      publish_on_save_config_item_type.add_default_option(yes_option)
+      CategoryClassification.create(:category => content_work_flow_category, :classification => publish_on_save_config_item_type)
+
+      configuration.configuration_item_types << publish_on_save_config_item_type
+
       #password strength
       simple_password_option = ConfigurationOption.create(
         :description => 'Simple password',
-        :comment => 'must be at least 8 characters long and start and end with a letter',
+        :comment => 'must be between 8 and 20 characters with no spaces',
         :internal_identifier => 'simple_password_regex',
-        :value => '^[A-Za-z]\w{6,}[A-Za-z]$'
+        :value => '^\S{8,20}$'
       )
 
       complex_password_option = ConfigurationOption.create(

data/db/data_migrations/20150118180450_add_website_member_roles.rb

@@ -0,0 +1,12 @@
+class AddWebsiteMemberRoles
+  
+  def self.up
+    website_role_type_parent = RoleType.find_or_create('website', 'Website')
+    RoleType.find_or_create('member', 'Member', website_role_type_parent)
+  end
+  
+  def self.down
+    RoleType.iid('website').destroy_all
+  end
+
+end

data/db/data_migrations/20150414150359_nest_knitkit_security_roles.rb

@@ -0,0 +1,35 @@
+class NestKnitkitSecurityRoles
+  
+  def self.up
+    website_author = SecurityRole.find_by_internal_identifier('website_author')
+    layout_author = SecurityRole.find_by_internal_identifier('layout_author')
+    content_author = SecurityRole.find_by_internal_identifier('content_author')
+    designer = SecurityRole.find_by_internal_identifier('designer')
+    publisher = SecurityRole.find_by_internal_identifier('publisher')
+
+    website_builder = SecurityRole.create(:internal_identifier => 'website_builder', :description => 'Website Builder')
+
+    website_author.move_to_child_of(website_builder)
+    layout_author.move_to_child_of(website_builder)
+    content_author.move_to_child_of(website_builder)
+    designer.move_to_child_of(website_builder)
+    publisher.move_to_child_of(website_builder)
+  end
+  
+  def self.down
+    website_author = SecurityRole.find_by_internal_identifier('website_author')
+    layout_author = SecurityRole.find_by_internal_identifier('layout_author')
+    content_author = SecurityRole.find_by_internal_identifier('content_author')
+    designer = SecurityRole.find_by_internal_identifier('designer')
+    publisher = SecurityRole.find_by_internal_identifier('publisher')
+
+    website_author.move_to_child_of(nil)
+    layout_author.move_to_child_of(nil)
+    content_author.move_to_child_of(nil)
+    designer.move_to_child_of(nil)
+    publisher.move_to_child_of(nil)
+
+    SecurityRole.find_by_internal_identifier('website_builder').destroy
+  end
+
+end