kit_cms 2.3.16 → 2.3.17

data/app/assets/stylesheets/kit/cms/dsc_tree.css

@@ -124,6 +124,10 @@
   color: red !important;
 }
 
+.dsc_tree li.not_published {
+  color: #888 !important;
+}
+
 .dsc_tree input {
   font-size: 14px;
   width: 200px;

data/app/assets/stylesheets/kit/forums.css

@@ -508,3 +508,33 @@ div#forums div.watch a {
 div#forums div#threads div.mod_actions {
   width: 600px;
 }
+
+div.markdown_preview {
+  background-color: white;
+  padding: 10px;
+  }
+
+div.modal_markdown_preview div.ui-dialog-content {
+  border: thin black solid;
+  font-family: Arial, "sans serif";
+}
+
+div.modal_markdown_preview div.ui-dialog-titlebar {
+  height: 20px;  
+  padding: 10px;
+  color: white;
+  background-color: #444;
+  font-family: Arial, "sans serif";
+  
+}
+
+div.modal_markdown_preview div.ui-dialog-titlebar span.ui-icon-closethick {
+  float: right;
+}
+
+div.ui-widget-overlay {
+  opacity: 0.2;
+  background-color: black;
+}
+
+

data/app/assets/stylesheets/kit/kit.css

@@ -2,7 +2,6 @@
  *= require './forums'
  *= require './calendar'
  *= require './dsc'
- *= require './markdown.css'
  *= require_self
  */
 

data/app/controllers/admin/dashboard_controller.rb

@@ -5,10 +5,17 @@ class Admin::DashboardController < AdminController
     comment = Comment.sys(_sid).where(:id=>params[:id]).first
 
     if comment
-      comment.update_attributes(params[:comment])
+      if params[:delete]
+        comment.destroy
+        render :js=>"$('tr.comment_#{comment.id}').remove();"
+      else
+        comment.update_attributes(params[:comment])
+        render :js=>"updated(#{comment.id}, #{comment.is_moderated}, #{comment.is_visible});"
+      end
+      return
     end
 
-    render :js=>"updated(#{comment.id}, #{comment.is_moderated}, #{comment.is_visible});"
+    render :js=>""
   end
 
   def user_comments
@@ -423,7 +430,9 @@ class Admin::DashboardController < AdminController
     @activity = @activity.includes(:user)
     end
     @activity = @activity.where(["category = ?", params[:cat]]) if params[:cat]
+    @activity = @activity.sys(_sid)
     @activity = @activity.order("created_at desc").page(params[:page]).per(100)
+    
 
     if request.xhr?
       render :partial=>"activity_list"

data/app/controllers/admin/page_templates_controller.rb

@@ -1,6 +1,18 @@
 class Admin::PageTemplatesController < AdminController
   layout "cms"
- 
+
+  def mapping
+    template = PageTemplate.sys(_sid).where(:id=>params[:id]).first
+    page = template.pages.first
+
+    if page==nil
+      render :js=>"$('#error_explanation').html('You must have already created at least one page with the \'#{template.name}\' template to use it for this page.').show();"
+      return
+    end
+
+    render :json=>page.current_content.map { |field| field.field_name }
+  end
+
   def pages
    @page_template = PageTemplate.sys(_sid).where(:id=>params[:id]).first
   
@@ -27,6 +39,7 @@ class Admin::PageTemplatesController < AdminController
       @page_template.is_default = 1
     end
     @page_template.user_id = current_user.id
+    @page_template.system_id = _sid
     if @page_template.save
       Activity.add(_sid, "Created Page Template '#{@page_template.name}'", current_user.id, "Page Template")
       redirect_to [:admin, @page_template], :notice => "Successfully created page template."

data/app/controllers/admin/user_controller.rb

@@ -284,13 +284,12 @@ class Admin::UserController < AdminController
   def stream_csv(users)
     filename = params[:action] + ".csv"    
 
-    #this is required if you want this to work with IE		
     csv_headers(filename)
 
     csv_string = CSV.generate do |csv|
-      csv << ["id","email","groups"]
+      csv << ["id","email","groups", "attributes"]
       users.each do |u|
-        csv << [u.id, u.email, u.groups.join(", ")]
+        csv << [u.id, u.email, u.groups.join(", "), u.user_attribute_values.map {|uav| "#{uav.user_attribute.name}:#{uav.value}"}.join(',')]
       end
     end
     render :text => csv_string 

data/app/controllers/category_controller.rb

@@ -207,9 +207,8 @@ class CategoryController < KitController
     end
 
     if @categories.size>0 
-      html = render_to_string(:partial=>"select_options.html")
-
-      render :js => "$('#page_category_id').html('#{html}'); $('#category_warning').html('');"
+      html = render_to_string(:partial=>"select_options").strip
+      render :js => "$('#page_category_id').html('#{html}'); $('#category_warning').html(''); "
     else
       render :js => "$('#page_category_id').html(''); $('#category_warning').html('No match found');"
     end
@@ -267,7 +266,7 @@ class CategoryController < KitController
   def grant_permission(category_id, group_id, mode)
       cg = CategoryGroup.sys(_sid).where(:category_id=>category_id).where(:group_id=>group_id).first
       unless cg
-        cg = CategoryGroup.new(:system_id=>_sid, :category_id=>category_id, :group_id=>group_id)
+        cg = CategoryGroup.new(:category_id=>category_id, :group_id=>group_id)
       end
       if mode=='read'
         cg.can_read = 1
@@ -280,9 +279,9 @@ class CategoryController < KitController
 
   def revoke_permission(category_id, group_id, mode)
       if mode=='read'
-        CategoryGroup.delete_all(["system_id = ? and category_id = ? and group_id = ?", _sid, category_id, group_id])      
+        CategoryGroup.delete_all(["category_id = ? and group_id = ?", _sid, category_id, group_id])      
       else
-        cg = CategoryGroup.sys(_sid).where(:category_id=>category_id).where(:group_id=>group_id).first
+        cg = CategoryGroup.where(:category_id=>category_id).where(:group_id=>group_id).first
         if cg
           cg.can_write = 0
           cg.save

data/app/controllers/form_controller.rb

@@ -85,7 +85,7 @@ class FormController < KitController
 
     if @form.notify.not_blank?
       @form.notify.split(',').each do |recipient|
-        Notification.form_submission(sub, _sid, recipient).deliver
+        Notification.form_submission(sub_id, _sid, recipient).deliver
       end
     end
 

data/app/controllers/forum_controller.rb

@@ -345,7 +345,7 @@ class ForumController < KitController
       @thread.last_post_by_user_display_name = current_user.display_name
       @thread.last_post_at = Time.now
       @thread.save
-      @thread.topic.post_count += 1
+      @thread.topic.post_count += 1 rescue 1
       @thread.topic.last_thread_id = @thread.id
       @thread.topic.last_post_at = Time.now
       @thread.topic.last_post_id = @post.id
@@ -545,7 +545,7 @@ class ForumController < KitController
       @post.created_by_user.notes << UserNote.new(:category=>"Forum", :description=>"Removed all posts for spamming", :created_by_id=>current_user)
       TopicPost.delete_all_by_user(_sid, @post.created_by_user_id, current_user)
     else
-      @post.created_by_user.user_notes << UserNote.new(:category=>"Forum", :description=>"Had <a href='#{@post.link}'>post</a> #{params[:delete]=='0' ? '' : 'un'}deleted", :created_by_id=>current_user)
+      @post.created_by_user.user_notes << UserNote.new(:category=>"Forum", :description=>"Had <a href='#{@post.link}'>post</a> #{params[:delete]=='0' ? '' : 'un'}deleted", :created_by_id=>current_user.id)
     end
 
     render :js=>"done_delete(#{@post.id}, #{@post.is_visible});"

data/app/controllers/kit_controller.rb

@@ -239,7 +239,7 @@ HERE
         inline_template = "<div id='page_#{page.id}' class='template_#{error_template.id}'>\n\n" + error_template.body + "\n\n</div>"
         render :inline=>inline_template, :layout=>error_template.layout.path, :type=>error_template.template_type || 'erb'
       else
-        render "error/application", :layout=>Preference.getCached(_sid, "error_layout") || "error", :status=>status
+        render "error/application", :layout=>Preference.getCached(_sid, "error_layout") || "application", :status=>status
       end
     end
 
@@ -337,7 +337,7 @@ HERE
       end
     end
 
-    render "form/show", :layout=>"application"
+    render "form/show", :layout=>((form.respond_to?(:layout) && form.layout) ? form.layout : 'application')
   end    
   
   def captcha_okay?

data/app/controllers/pages_controller.rb

@@ -439,6 +439,30 @@ class PagesController < KitController
     @terms = @page.terms
   end
 
+  def page_template
+    if request.put?
+      page = Page.sys(_sid).where(:id=>params[:id]).first
+      return unless page
+      notice = nil 
+      if page.page_template_id != params[:page][:page_template_id]
+        new_template = PageTemplate.sys(_sid).where(:id=>params[:page][:page_template_id]).first
+        if new_template
+          lookup = {}
+          page.page_template_id = params[:page][:page_template_id]
+          page.save
+          params.each do |param_name, new_name|
+            if param_name =~ /^f_(.+)$/
+              old_name = $1
+              PageContent.connection.execute("update page_contents set field_name = '#{new_name}' where field_name = '#{old_name}' and page_id = #{page.id}")
+            end
+          end
+          notice = 'Changes saved'
+        end
+      end
+      redirect_to "/page/#{params[:id]}/info", :notice=>notice
+    end 
+  end
+
   def info    
     if params[:sitemap] && request.post?
       @page.skip_history

data/app/controllers/user/passwords_controller.rb

@@ -3,6 +3,8 @@ class User::PasswordsController < Devise::PasswordsController
   include DomainController
   include DeviseExtender
 
+  helper_method :stylesheets
+  
   before_filter :set_system
   before_filter { params[:user][:system_id] = _sids if params[:user]}
   

data/app/controllers/user/registrations_controller.rb

@@ -14,10 +14,6 @@ class User::RegistrationsController < Devise::RegistrationsController
     return path.to_s
   end
 
-  def stylesheets
-    "xxxx"
-  end
-
   def create
     self.kit_template = "user/register" 
     build_resource
@@ -62,6 +58,7 @@ class User::RegistrationsController < Devise::RegistrationsController
     @page_title = "Sign Up"
     self.kit_template = "user/register"
 
+    session[:captcha_okay] = true
     if params[:return_to]
       session[:return_to] = params[:return_to]
     elsif url = Preference.get_cached(_sid, "url_after_sign_up")

data/app/controllers/user/sessions_controller.rb

@@ -5,6 +5,8 @@ class User::SessionsController < Devise::SessionsController
 
   before_filter :set_system
   before_filter { params[:user][:system_id] = _sids if params[:user]}
+
+  helper_method :stylesheets
   
   layout "application"
 

data/app/controllers/user/unlocks_controller.rb

@@ -3,6 +3,8 @@ class User::UnlocksController < Devise::UnlocksController
   include DomainController
   include DeviseExtender
 
+  helper_method :stylesheets
+  
   before_filter :set_system
   before_filter { params[:user][:system_id] = _sids if params[:user]}
   

data/app/controllers/user_controller.rb

@@ -73,7 +73,7 @@ class UserController < KitController
           else
             uav.value = val
           end
-          uav.updated_by = current_user
+          uav.updated_by = current_user.id
           if uav.save
             at_least_one = true
           else

data/app/helpers/calendar_helper.rb

@@ -168,7 +168,9 @@ module CalendarHelper
     last_region_id = nil 
     first = true
     op = "{ "
+    at_least_one = false
     Subregion.order("regions.name, subregions.name").includes(:region).each do |sr| 
+      at_least_one = true
       if sr.region_id != last_region_id 
         if !first
           op += "],\r\n"
@@ -180,7 +182,8 @@ module CalendarHelper
       end
       op += "[ \"#{sr.name}\", #{sr.id} ], "
     end
-    op += "]}"
+    op += "]" if at_least_one
+    op += "}"
 
     return op.html_safe
   end

data/app/helpers/kit_helper.rb

@@ -96,7 +96,7 @@ module KitHelper
     s = stylesheets 
     rescue Exception => e
       s = ['application'] 
-      logger.debug "#{e.message}"
+      logger.info "#{e.message}"
     end
     (additional + s).each do |name|
       next if name.is_blank?
@@ -142,12 +142,12 @@ module KitHelper
     link_to_function label, "submit_form(this)", options
   end
 
-  def cm_editor(mode, object, field, form, form_field = nil)
+  def cm_editor(mode, object, field, form, form_field = nil, options = {})
     form_field ||= "#{object}_#{field}"
   
     mode = 'htmlmixed' if mode == 'html'
     mode = 'css' if mode == 'sass' || mode == 'scss'
-    render :partial=>'utility/cm_editor', :locals=>{:mode=>mode, :field=>field, :form_field=>form_field, :form=>form}
+    render :partial=>'utility/cm_editor', :locals=>{:mode=>mode, :field=>field, :form_field=>form_field, :form=>form, :options=>options}
   end
 
   def hide_if(bool)

data/app/mailers/notification.rb

@@ -30,9 +30,9 @@ class Notification < ActionMailer::Base
     mail :from=>isfrom(sid),:subject=>"Event #{event.id} occurred: #{event.name}",  :to => Preference.getCached(sid, 'notify:event')
   end
 
-  def form_submission(submission,sid, recipient)
-    @sub = submission
-
+  def form_submission(submission_id,sid, recipient)
+    @sub = FormSubmission.find(submission_id)
+    @sid = sid
     mail :subject=>"#{Preference.getCached(sid,'app_name')} #{@sub.form.title} Submission",
            :to=>recipient, :from=>isfrom(sid)
   end

data/app/models/activity.rb

@@ -3,8 +3,11 @@ class Activity < ActiveRecord::Base
   belongs_to :user
 
   attr_accessible :system_id, :name, :user_id, :category, :description
-  def self.add(sys_id, name, user_id=0, category='', description='')
-    Activity.create(:user_id=>user_id, :system_id=>sys_id, :name=>name, :category=>category, :description=>description).save
+
+
+  def self.add(sys_id, name, user_or_user_id=0, category='', description='')
+    user_or_user_id = 0 if user_or_user_id == nil
+    Activity.create(:user_id=>user_or_user_id.is_a?(Integer) ? user_or_user_id : user_or_user_id.id, :system_id=>sys_id, :name=>name, :category=>category, :description=>description).save
   end
 
 end

data/app/models/calendar.rb

@@ -6,7 +6,7 @@ class Calendar < ActiveRecord::Base
   validates :name, :presence=>true, :uniqueness=>true, :length=>{:minimum=>1, :maximum=>200}
 
   def entries_between(start_date, end_date, filter, position = nil, distance = nil) 
-    e = self.calendar_entries.where(["(start_date < ? and end_date > ?)", end_date, start_date]).includes({:location=>:subregion})
+    e = self.calendar_entries.where(["(start_date <= ? and end_date >= ?)", end_date, start_date]).includes({:location=>:subregion})
 
     if filter =~ /subregions.name/
       e = e.joins({:location=>:subregion})

data/app/models/category.rb

@@ -91,7 +91,21 @@ class Category < KitIndexed
 
   # all categories, in depth order (root at the top)
   def self.tree_by_depth(sid)
-    Category.sys(sid).includes(:category_groups).all.sort { |a,b| a.depth <=> b.depth }
+    Category.sys(sid).includes(:category_groups).all.sort do |a,b| 
+      if a.depth < b.depth
+        -1
+      elsif a.depth > b.depth
+        1
+      else
+        if a.name < b.name
+          -1
+        elsif a.name > b.name
+          1
+        else
+          0
+        end
+      end
+    end
   end
 
   # all categories, in a hash keyed by parent_id
@@ -109,7 +123,7 @@ class Category < KitIndexed
   # all categories, in a hash keyed by category_id, with "parent_of" attribute populated with a list of child categories AND child documents
   def self.tree_with_children(sid)
     lookup = { }
-    cats = Category.sys(sid).all
+    cats = Category.sys(sid).order(:name).all
     
     cats.each do |cat|
       cat.parent_of = []
@@ -122,7 +136,7 @@ class Category < KitIndexed
       lookup[cat.parent_id].parent_of << cat
     end
 
-    Page.sys(sid).includes(:status).find_each do |page|
+    Page.sys(sid).order(:name).includes(:status).find_each do |page|
       lookup[page.category_id].parent_of << page
     end
  
@@ -168,7 +182,7 @@ class Category < KitIndexed
   def self.build_permission_cache(sid)
     @@perms_cache[sid] = {}
     all_groups = {}
-    Group.all.collect { |g| all_groups[g.id] = g.name }
+    Group.where(:system_id=>sid).all.collect { |g| all_groups[g.id] = g.name }
     Category.tree_by_depth(sid).each do |cat|
       permissions = @@perms_cache[sid][cat.parent_id] ? @@perms_cache[sid][cat.parent_id].clone : { :read_groups=>{}, :write_groups=>{} } # start with permissions of parent
 

data/app/models/experiment.rb

@@ -4,6 +4,8 @@ class Experiment < ActiveRecord::Base
   belongs_to :user
   belongs_to :goal
 
+  validates :end_date, :presence=>true
+
   after_save { Experiment.flush_cache }
   after_destroy { Experiment.flush_cache }
 

data/app/models/form_submission.rb

@@ -2,9 +2,9 @@ class FormSubmission  < KitIndexed
 
   FormSubmission.do_indexing :FormSubmission, [
     {:name=>"id", :index=>:not_analyzed, :include_in_all=>false},
-    {:name=>"location", :type => 'geo_point', :as=>'"#{self.lat}, #{self.lon}"' },
+    {:name=>"location", :type => 'geo_point', :as=>'"#{self.lat ? self.lat : 0}, #{self.lon ? self.lon : 0}"' },
     {:name=>"created_at", :index=>:not_analyzed, :include_in_all=>false},
-    {:name=>"marked", :index=>:not_analyzed, :include_in_all=>false},
+    {:name=>"marked", :as=>"self.marked ? self.marked : 0", :index=>:not_analyzed, :include_in_all=>false},
     {:name=>"system_id", :index=>:not_analyzed, :include_in_all=>false},
     {:name=>"email", :boost=>50 , :as=>"self.user ? self.user.email : ''"},
     {:name=>"form_id", :boost=>100, :as=>"self.form_id", :include_in_all=>false},