Merge branch 'master' of ssh://51.254.143.84:9319/home/git/simple_crm

This commit is contained in:
Mini Robot 2018-02-03 21:33:01 +01:00
commit 57cdc914c1
1 changed files with 6 additions and 6 deletions

View File

@ -5,13 +5,13 @@ class SiteController < ApplicationController
@ss = ScSetting.first
pg_name = 'index'
if cookies.encrypted[:visited].blank?
cookies.encrypted[:visited] = JSON.generate([pg_name])
cookies.permanent.encrypted[:visited] = JSON.generate([pg_name])
@ss.increment!(:index_number_of_views)
else
arr = JSON.parse(cookies.encrypted[:visited])
if !arr.include?(pg_name)
arr << pg_name
cookies.encrypted[:visited] = JSON.generate(arr)
cookies.permanent.encrypted[:visited] = JSON.generate(arr)
@ss.increment!(:index_number_of_views)
end
end
@ -21,13 +21,13 @@ class SiteController < ApplicationController
pages_get
@page = PublishedPage.where('id = ? OR slug = ?',params[:id],params[:id]).first
if cookies.encrypted[:visited].blank?
cookies.encrypted[:visited] = JSON.generate([@page.id])
cookies.permanent.encrypted[:visited] = JSON.generate([@page.id])
@page.increment!(:number_of_views)
else
arr = JSON.parse(cookies.encrypted[:visited])
if !arr.include?(@page.id)
arr << @page.id
cookies.encrypted[:visited] = JSON.generate(arr)
cookies.permanent.encrypted[:visited] = JSON.generate(arr)
@page.increment!(:number_of_views)
end
end
@ -41,13 +41,13 @@ class SiteController < ApplicationController
@ss = ScSetting.first
pg_name = 'kontakt'
if cookies.encrypted[:visited].blank?
cookies.encrypted[:visited] = JSON.generate([pg_name])
cookies.permanent.encrypted[:visited] = JSON.generate([pg_name])
@ss.increment!(:contact_number_of_views)
else
arr = JSON.parse(cookies.encrypted[:visited])
if !arr.include?(pg_name)
arr << pg_name
cookies.encrypted[:visited] = JSON.generate(arr)
cookies.permanent.encrypted[:visited] = JSON.generate(arr)
@ss.increment!(:contact_number_of_views)
end
end