Inicio Explorar Axuda
Rexistro Iniciar sesión
dcatadmin2
/
dcat-admin2
2
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

admin_url

jqh %!s(int64=6) %!d(string=hai) anos
pai
8db25bc566
achega
ec3f02ae0d
Modificáronse 6 ficheiros con 15 adicións e 10 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 1 1
      resources/views/helpers/scaffold.blade.php
  2. 2 2
      resources/views/login.blade.php
  3. 1 1
      resources/views/partials/header.blade.php
  4. 2 2
      resources/views/partials/navbar-user-panel.blade.php
  5. 2 2
      src/Controllers/AuthController.php
  6. 7 2
      src/Tree.php

+ 1 - 1
resources/views/helpers/scaffold.blade.php
Ver ficheiro 

@@ -307,7 +307,7 @@
 
             write_controller(tb);
 
             write_model(tb);
 
 
-            $.post('{{admin_base_path('helpers/scaffold/table')}}', {db: db, tb: tb, _token: LA.token}, function (res) {
 
+            $.post('{{admin_url('helpers/scaffold/table')}}', {db: db, tb: tb, _token: LA.token}, function (res) {
 
                 LA.loading(false);
 
 
                 if (!res.list) return;

+ 2 - 2
resources/views/login.blade.php
Ver ficheiro 

@@ -49,13 +49,13 @@
 
 <body class="hold-transition login-page" @if(config('admin.login_background_image'))style="background:url({{config('admin.login_background_image')}});background-size:cover"@endif>
 
 <div class="login-box">
 
   <div class="login-logo">
 
-    <a href="{{ admin_base_path('/') }}">{{config('admin.name')}}</a>
 
+    <a href="{{ admin_url('/') }}">{{config('admin.name')}}</a>
 
   </div>
 
   <!-- /.login-logo -->
 
   <div class="login-box-body">
 
     {{--<p class="login-box-msg">{{ trans('admin.login') }}</p>--}}
 
 
-    <form action="{{ admin_base_path('auth/login') }}" method="post">
 
+    <form action="{{ admin_url('auth/login') }}" method="post">
 
       <div class="form-group has-feedback {!! !$errors->has('username') ?: 'has-error' !!}">
 
 
         @if($errors->has('username'))

+ 1 - 1
resources/views/partials/header.blade.php
Ver ficheiro 

@@ -2,7 +2,7 @@
 
 <header class="main-header">
 
 
     <!-- Logo -->
 
-    <a href="{{ admin_base_path('/') }}" class="logo waves-effect waves-light">
 
+    <a href="{{ admin_url('/') }}" class="logo waves-effect waves-light">
 
         <!-- mini logo for sidebar mini 50x50 pixels -->
 
         <span class="logo-mini">{!! config('admin.logo-mini', config('admin.name')) !!}</span>
 
         <!-- logo for regular state and mobile devices -->

+ 2 - 2
resources/views/partials/navbar-user-panel.blade.php
Ver ficheiro 

@@ -18,10 +18,10 @@
 
         </li>
 
         <li class="user-footer">
 
             <div class="pull-left">
 
-                <a href="{{ admin_base_path('auth/setting') }}" class="btn btn-default ">{{ trans('admin.setting') }}</a>
 
+                <a href="{{ admin_url('auth/setting') }}" class="btn btn-default ">{{ trans('admin.setting') }}</a>
 
             </div>
 
             <div class="pull-right">
 
-                <a href="{{ admin_base_path('auth/logout') }}" class="btn btn-default ">{{ trans('admin.logout') }}</a>
 
+                <a href="{{ admin_url('auth/logout') }}" class="btn btn-default ">{{ trans('admin.logout') }}</a>
 
             </div>
 
         </li>
 
     </ul>

+ 2 - 2
src/Controllers/AuthController.php
Ver ficheiro 

@@ -76,7 +76,7 @@ class AuthController extends Controller
 
 
         $request->session()->invalidate();
 
 
-        $path = admin_base_path('auth/login');
 
+        $path = admin_url('auth/login');
 
         if ($request->pjax()) {
 
             return "<script>location.href = '$path';</script>";
 
         }
 
@@ -186,7 +186,7 @@ class AuthController extends Controller
 
         $form->saved(function () {
 
             admin_alert(trans('admin.update_succeeded'));
 
 
-            return redirect(admin_base_path('auth/setting'));
 
+            return redirect(admin_url('auth/setting'));
 
         });
 
 
         return $form;

+ 7 - 2
src/Tree.php
Ver ficheiro 

@@ -52,6 +52,11 @@ class Tree implements Renderable
 
      */
 
     protected $branchCallback = null;
 
 
+    /**
 
+     * @var string
 
+     */
 
+    public $path;
 
+
 
     /**
 
      * @var bool
 
      */
 
@@ -119,7 +124,7 @@ class Tree implements Renderable
 
     {
 
         $this->model = $model;
 
 
-        $this->path = app('request')->getPathInfo();
 
+        $this->path = $this->path ?: request()->getPathInfo();
 
         $this->elementId .= uniqid();
 
 
         $this->setupTools();
 
@@ -488,7 +493,7 @@ JS;
 
         Admin::script($this->script());
 
 
         view()->share([
 
-            'path'           => $this->path,
 
+            'path'           => url($this->path),
 
             'keyName'        => $this->model->getKeyName(),
 
             'branchView'     => $this->view['branch'],
 
             'branchCallback' => $this->branchCallback,