Skip to content

Commit

Permalink
Remove Component suffix
Browse files Browse the repository at this point in the history
  • Loading branch information
miks committed Jan 28, 2016
1 parent 2a475de commit e027540
Show file tree
Hide file tree
Showing 11 changed files with 45 additions and 43 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,9 @@
## Changelog

### 2016.01.28
* *Component suffix has been removed. Releaf initializer needs to be
updated if components has been specified.

### 2016.01.05
* Node#url has been renamed to Node#path.

Expand Down
4 changes: 2 additions & 2 deletions docs/documentation/settings.md
Expand Up @@ -29,9 +29,9 @@ Releaf::Settings.register([
### UI
To enable simple controller for changing existing Releaf::Settings values, make following changes in releaf initializer:

* Add "Releaf::SettingsComponent" to releaf components definition:
* Add "Releaf::Core::SettingsUI" to releaf components definition:
```
config.components = [Releaf::Core::SettingsUIComponent]
config.components = [Releaf::Core::SettingsUI]
```
* Add "releaf/core/controller" to releaf menu definition:
```
Expand Down
Expand Up @@ -28,7 +28,7 @@
]

config.additional_controllers = %w[admin/chapters releaf/permissions/profile]
config.components = [Releaf::I18nDatabase, Releaf::Permissions, Releaf::Content, Releaf::Core::SettingsUIComponent]
config.components = [Releaf::I18nDatabase, Releaf::Permissions, Releaf::Content, Releaf::Core::SettingsUI]
config.available_locales = ["en", "lv"]
# conf.layout_builder_class_name = "CustomLayoutBuilder"
# conf.devise_for 'releaf/admin'
Expand Down
4 changes: 2 additions & 2 deletions releaf-core/lib/releaf/core/engine.rb
Expand Up @@ -14,12 +14,12 @@

module Releaf::Core
require 'releaf/core/component'
require 'releaf/core/settings_ui_component'
require 'releaf/core/settings_ui'
require 'releaf/core/route_mapper'
require 'releaf/core/builders_autoload'

def self.components
[Releaf::Core::SettingsUIComponent]
[Releaf::Core::SettingsUI]
end

class Engine < ::Rails::Engine
Expand Down
@@ -1,4 +1,4 @@
module Releaf::Core::SettingsUIComponent
module Releaf::Core::SettingsUI
extend Releaf::Core::Component

def self.draw_component_routes router
Expand Down
@@ -1,34 +1,32 @@
module Releaf::Permissions
class SessionsController < Devise::SessionsController
layout "releaf/admin"
helper_method :page_title
class Releaf::Permissions::SessionsController < Devise::SessionsController
layout "releaf/admin"
helper_method :page_title

def page_title
Rails.application.class.parent_name
end
def page_title
Rails.application.class.parent_name
end

def access_control
@access_control ||= Releaf::Permissions::AccessControl.new(controller: self)
end
def access_control
@access_control ||= Releaf::Permissions::AccessControl.new(controller: self)
end

def layout_settings(key)
access_control.user.try(:settings).try(:[], 'releaf.side.compact')
end
def layout_settings(key)
access_control.user.try(:settings).try(:[], 'releaf.side.compact')
end

protected
protected

def after_sign_in_path_for resource
if custom_redirect_path
custom_redirect_path
else
stored_location_for(resource) || releaf_root_path
end
def after_sign_in_path_for resource
if custom_redirect_path
custom_redirect_path
else
stored_location_for(resource) || releaf_root_path
end
end

def custom_redirect_path
return nil if params[:redirect_to].blank?
return nil if params[:redirect_to][0] != '/'
return params[:redirect_to]
end
def custom_redirect_path
return nil if params[:redirect_to].blank?
return nil if params[:redirect_to][0] != '/'
return params[:redirect_to]
end
end
@@ -1,4 +1,4 @@
module Releaf::Permissions::DeviseComponent
module Releaf::Permissions::Devise
def self.draw_component_routes router
router.devise_for Releaf.application.config.devise_for, path: "", controllers: { sessions: "releaf/permissions/sessions" }
router.namespace :releaf, path: nil do
Expand Down
16 changes: 8 additions & 8 deletions releaf-permissions/lib/releaf/permissions/engine.rb
@@ -1,10 +1,10 @@
require 'devise'

module Releaf::Permissions
require 'releaf/permissions/devise_component'
require 'releaf/permissions/profile_component'
require 'releaf/permissions/roles_component'
require 'releaf/permissions/users_component'
require 'releaf/permissions/devise'
require 'releaf/permissions/profile'
require 'releaf/permissions/roles'
require 'releaf/permissions/users'
require 'releaf/permissions/builders_autoload'

class Engine < ::Rails::Engine
Expand All @@ -15,10 +15,10 @@ class Engine < ::Rails::Engine

def self.components
[
Releaf::Permissions::DeviseComponent,
Releaf::Permissions::RolesComponent,
Releaf::Permissions::UsersComponent,
Releaf::Permissions::ProfileComponent
Releaf::Permissions::Devise,
Releaf::Permissions::Roles,
Releaf::Permissions::Users,
Releaf::Permissions::Profile
]
end
end
@@ -1,4 +1,4 @@
module Releaf::Permissions::ProfileComponent
module Releaf::Permissions::Profile
def self.draw_component_routes router
router.namespace :releaf, path: nil do
router.get "profile", to: "permissions/profile#edit", as: :permissions_user_profile
Expand Down
@@ -1,4 +1,4 @@
module Releaf::Permissions::RolesComponent
module Releaf::Permissions::Roles
extend Releaf::Core::Component

def self.draw_component_routes router
Expand Down
@@ -1,4 +1,4 @@
module Releaf::Permissions::UsersComponent
module Releaf::Permissions::Users
extend Releaf::Core::Component

def self.draw_component_routes(router)
Expand Down

0 comments on commit e027540

Please sign in to comment.