Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Platform
Commits
88c7d35c
Unverified
Commit
88c7d35c
authored
Jun 29, 2018
by
Nicolas Widart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Using renamed method to get all enabled modules
Fix the typehint to use the correct class
parent
14f71669
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
9 deletions
+11
-9
SettingController.php
Modules/Setting/Http/Controllers/Admin/SettingController.php
+3
-2
PermissionManager.php
Modules/User/Permissions/PermissionManager.php
+3
-3
SentinelUserRepository.php
...les/User/Repositories/Sentinel/SentinelUserRepository.php
+1
-1
ModuleManager.php
Modules/Workshop/Manager/ModuleManager.php
+4
-3
No files found.
Modules/Setting/Http/Controllers/Admin/SettingController.php
View file @
88c7d35c
...
@@ -7,6 +7,7 @@ use Modules\Core\Http\Controllers\Admin\AdminBaseController;
...
@@ -7,6 +7,7 @@ use Modules\Core\Http\Controllers\Admin\AdminBaseController;
use
Modules\Core\Traits\CanRequireAssets
;
use
Modules\Core\Traits\CanRequireAssets
;
use
Modules\Setting\Http\Requests\SettingRequest
;
use
Modules\Setting\Http\Requests\SettingRequest
;
use
Modules\Setting\Repositories\SettingRepository
;
use
Modules\Setting\Repositories\SettingRepository
;
use
Nwidart\Modules\Contracts\RepositoryInterface
;
use
Nwidart\Modules\Module
;
use
Nwidart\Modules\Module
;
class
SettingController
extends
AdminBaseController
class
SettingController
extends
AdminBaseController
...
@@ -17,7 +18,7 @@ class SettingController extends AdminBaseController
...
@@ -17,7 +18,7 @@ class SettingController extends AdminBaseController
*/
*/
private
$setting
;
private
$setting
;
/**
/**
* @var
Modul
e
* @var
RepositoryInterfac
e
*/
*/
private
$module
;
private
$module
;
/**
/**
...
@@ -51,7 +52,7 @@ class SettingController extends AdminBaseController
...
@@ -51,7 +52,7 @@ class SettingController extends AdminBaseController
{
{
$this
->
session
->
put
(
'module'
,
$currentModule
->
getLowerName
());
$this
->
session
->
put
(
'module'
,
$currentModule
->
getLowerName
());
$modulesWithSettings
=
$this
->
setting
->
moduleSettings
(
$this
->
module
->
e
nabled
());
$modulesWithSettings
=
$this
->
setting
->
moduleSettings
(
$this
->
module
->
allE
nabled
());
$translatableSettings
=
$this
->
setting
->
translatableModuleSettings
(
$currentModule
->
getLowerName
());
$translatableSettings
=
$this
->
setting
->
translatableModuleSettings
(
$currentModule
->
getLowerName
());
$plainSettings
=
$this
->
setting
->
plainModuleSettings
(
$currentModule
->
getLowerName
());
$plainSettings
=
$this
->
setting
->
plainModuleSettings
(
$currentModule
->
getLowerName
());
...
...
Modules/User/Permissions/PermissionManager.php
View file @
88c7d35c
...
@@ -2,12 +2,12 @@
...
@@ -2,12 +2,12 @@
namespace
Modules\User\Permissions
;
namespace
Modules\User\Permissions
;
use
Nwidart\Modules\
Modul
e
;
use
Nwidart\Modules\
Contracts\RepositoryInterfac
e
;
class
PermissionManager
class
PermissionManager
{
{
/**
/**
* @var
Modul
e
* @var
RepositoryInterfac
e
*/
*/
private
$module
;
private
$module
;
...
@@ -25,7 +25,7 @@ class PermissionManager
...
@@ -25,7 +25,7 @@ class PermissionManager
public
function
all
()
public
function
all
()
{
{
$permissions
=
[];
$permissions
=
[];
foreach
(
$this
->
module
->
e
nabled
()
as
$enabledModule
)
{
foreach
(
$this
->
module
->
allE
nabled
()
as
$enabledModule
)
{
$configuration
=
config
(
strtolower
(
'asgard.'
.
$enabledModule
->
getName
())
.
'.permissions'
);
$configuration
=
config
(
strtolower
(
'asgard.'
.
$enabledModule
->
getName
())
.
'.permissions'
);
if
(
$configuration
)
{
if
(
$configuration
)
{
$permissions
[
$enabledModule
->
getName
()]
=
$configuration
;
$permissions
[
$enabledModule
->
getName
()]
=
$configuration
;
...
...
Modules/User/Repositories/Sentinel/SentinelUserRepository.php
View file @
88c7d35c
...
@@ -264,7 +264,7 @@ class SentinelUserRepository implements UserRepository
...
@@ -264,7 +264,7 @@ class SentinelUserRepository implements UserRepository
return
Activation
::
remove
(
$user
);
return
Activation
::
remove
(
$user
);
}
}
if
(
!
Activation
::
completed
(
$user
)
&&
$data
[
'activated'
])
{
if
(
!
Activation
::
completed
(
$user
)
&&
$data
[
'
is_
activated'
])
{
$activation
=
Activation
::
create
(
$user
);
$activation
=
Activation
::
create
(
$user
);
return
Activation
::
complete
(
$user
,
$activation
->
code
);
return
Activation
::
complete
(
$user
,
$activation
->
code
);
...
...
Modules/Workshop/Manager/ModuleManager.php
View file @
88c7d35c
...
@@ -5,13 +5,14 @@ namespace Modules\Workshop\Manager;
...
@@ -5,13 +5,14 @@ namespace Modules\Workshop\Manager;
use
Illuminate\Config\Repository
as
Config
;
use
Illuminate\Config\Repository
as
Config
;
use
Illuminate\Filesystem\Filesystem
;
use
Illuminate\Filesystem\Filesystem
;
use
Illuminate\Support\Collection
;
use
Illuminate\Support\Collection
;
use
Nwidart\Modules\Contracts\RepositoryInterface
;
use
Nwidart\Modules\Module
;
use
Nwidart\Modules\Module
;
use
Symfony\Component\Yaml\Parser
;
use
Symfony\Component\Yaml\Parser
;
class
ModuleManager
class
ModuleManager
{
{
/**
/**
* @var
Modul
e
* @var
RepositoryInterfac
e
*/
*/
private
$module
;
private
$module
;
/**
/**
...
@@ -68,7 +69,7 @@ class ModuleManager
...
@@ -68,7 +69,7 @@ class ModuleManager
*/
*/
public
function
enabled
()
public
function
enabled
()
{
{
return
$this
->
module
->
e
nabled
();
return
$this
->
module
->
allE
nabled
();
}
}
/**
/**
...
@@ -89,7 +90,7 @@ class ModuleManager
...
@@ -89,7 +90,7 @@ class ModuleManager
*/
*/
public
function
getFlippedEnabledModules
()
public
function
getFlippedEnabledModules
()
{
{
$enabledModules
=
$this
->
module
->
e
nabled
();
$enabledModules
=
$this
->
module
->
allE
nabled
();
$enabledModules
=
array_map
(
function
(
Module
$module
)
{
$enabledModules
=
array_map
(
function
(
Module
$module
)
{
return
$module
->
getName
();
return
$module
->
getName
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment