diff --git a/CHANGELOG.md b/CHANGELOG.md index f286921..8e24568 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,13 @@ #### [Current] + * [653ad04](../../commit/653ad04) - __(Ahmet Sezgin Duran)__ TB-60 #time 30m Fix profile controller errors + +#### 1.6.1 + * [844f583](../../commit/844f583) - __(Ahmet Sezgin Duran)__ TB-44 #time 1m Bump version 1.6.1 * [6ce514d](../../commit/6ce514d) - __(Ahmet Sezgin Duran)__ TB-44 #time 5m Add Cybele migration info * [32e09e2](../../commit/32e09e2) - __(Onur Özgür ÖZKAN)__ Update ruby version 2.1.2 + +#### 1.6.0 * [86508de](../../commit/86508de) - __(Muhammet DİLEK)__ bump version 1.6.0 * [758c2c9](../../commit/758c2c9) - __(Muhammet DİLEK)__ TB-20 ruby migrated 2.1.1 * [f7a65f8](../../commit/f7a65f8) - __(Muhammet DİLEK)__ TB-20 rails migrated 4.1.1 @@ -40,8 +46,6 @@ TB-7 #time 10m Update Rails version in cybele_Gemfile * [21137a8](../../commit/21137a8) - __(Onur Özgür ÖZKAN)__ Update cybele_Gemfile * [d53dc47](../../commit/d53dc47) - __(Onur Özgür ÖZKAN)__ Update kangal version 1.2.3 * [9c457d2](../../commit/9c457d2) - __(Onur Özgür ÖZKAN)__ Update recipes_matic gem version to 1.0.0 - -#### v1.3.0 * [6a1c519](../../commit/6a1c519) - __(Onur Ozgur OZKAN)__ version fixed #### 1.3.0 diff --git a/lib/cybele/app_builder.rb b/lib/cybele/app_builder.rb index 8bde6b1..10c5f46 100644 --- a/lib/cybele/app_builder.rb +++ b/lib/cybele/app_builder.rb @@ -121,7 +121,7 @@ def configure_bullet Bullet.alert = true Bullet.bullet_logger = true end - RUBY + RUBY configure_environment 'development', config end @@ -264,14 +264,14 @@ def setup_profile_editors inject_into_file 'config/routes.rb', :after => "namespace :hq do\n" do <<-RUBY root to: 'dashboard#index' resource :admin_profile, except: [:destroy], path: 'profile' - RUBY + RUBY end - inject_into_file 'config/routes.rb', :after => "'welcome#index'\n" do <<-RUBY + inject_into_file 'config/routes.rb', :after => "to: 'welcome#index'\n" do <<-RUBY - resource :user_profile, except: [:destroy], path: 'profile' +resource :user_profile, except: [:destroy], path: 'profile' - RUBY + RUBY end end diff --git a/lib/cybele/version.rb b/lib/cybele/version.rb index ad96097..e0ce4d5 100644 --- a/lib/cybele/version.rb +++ b/lib/cybele/version.rb @@ -1,4 +1,4 @@ module Cybele - VERSION = '1.6.1'.freeze + VERSION = '1.6.2'.freeze end diff --git a/templates/app/controllers/hq/admin_profiles_controller.rb b/templates/app/controllers/hq/admin_profiles_controller.rb index 01ad4c3..1708a1a 100644 --- a/templates/app/controllers/hq/admin_profiles_controller.rb +++ b/templates/app/controllers/hq/admin_profiles_controller.rb @@ -1,6 +1,6 @@ # encoding: UTF-8 class Hq::AdminProfilesController < Hq::ApplicationController - before_action :profile_controller + before_action :profile_controller, except: [:new] before_action :set_admin_profile, only: [:show, :edit, :update, :destroy] add_breadcrumb I18n.t('activerecord.models.admin_profiles'), :hq_admin_profile_path diff --git a/templates/app/controllers/user_profiles_controller.rb b/templates/app/controllers/user_profiles_controller.rb index c5c7ad6..191da77 100644 --- a/templates/app/controllers/user_profiles_controller.rb +++ b/templates/app/controllers/user_profiles_controller.rb @@ -1,6 +1,7 @@ # encoding: UTF-8 class UserProfilesController < ApplicationController - before_action :profile_controller + before_action :authenticate_user! + before_action :profile_controller, except: [:new] before_action :set_user_profile, only: [:show, :edit, :update, :destroy] add_breadcrumb I18n.t('activerecord.models.user_profiles'), :user_profile_path