Merge pull request #3487 from nextcloud/fix-files-header-name
Fix app name of files app
This commit is contained in:
commit
813802238b
|
@ -57,7 +57,6 @@ class Application extends App {
|
||||||
$c->query('AppName'),
|
$c->query('AppName'),
|
||||||
$c->query('Request'),
|
$c->query('Request'),
|
||||||
$server->getURLGenerator(),
|
$server->getURLGenerator(),
|
||||||
$server->getNavigationManager(),
|
|
||||||
$c->query('L10N'),
|
$c->query('L10N'),
|
||||||
$server->getConfig(),
|
$server->getConfig(),
|
||||||
$server->getEventDispatcher(),
|
$server->getEventDispatcher(),
|
||||||
|
|
|
@ -55,8 +55,6 @@ class ViewController extends Controller {
|
||||||
protected $request;
|
protected $request;
|
||||||
/** @var IURLGenerator */
|
/** @var IURLGenerator */
|
||||||
protected $urlGenerator;
|
protected $urlGenerator;
|
||||||
/** @var INavigationManager */
|
|
||||||
protected $navigationManager;
|
|
||||||
/** @var IL10N */
|
/** @var IL10N */
|
||||||
protected $l10n;
|
protected $l10n;
|
||||||
/** @var IConfig */
|
/** @var IConfig */
|
||||||
|
@ -74,7 +72,6 @@ class ViewController extends Controller {
|
||||||
* @param string $appName
|
* @param string $appName
|
||||||
* @param IRequest $request
|
* @param IRequest $request
|
||||||
* @param IURLGenerator $urlGenerator
|
* @param IURLGenerator $urlGenerator
|
||||||
* @param INavigationManager $navigationManager
|
|
||||||
* @param IL10N $l10n
|
* @param IL10N $l10n
|
||||||
* @param IConfig $config
|
* @param IConfig $config
|
||||||
* @param EventDispatcherInterface $eventDispatcherInterface
|
* @param EventDispatcherInterface $eventDispatcherInterface
|
||||||
|
@ -85,7 +82,6 @@ class ViewController extends Controller {
|
||||||
public function __construct($appName,
|
public function __construct($appName,
|
||||||
IRequest $request,
|
IRequest $request,
|
||||||
IURLGenerator $urlGenerator,
|
IURLGenerator $urlGenerator,
|
||||||
INavigationManager $navigationManager,
|
|
||||||
IL10N $l10n,
|
IL10N $l10n,
|
||||||
IConfig $config,
|
IConfig $config,
|
||||||
EventDispatcherInterface $eventDispatcherInterface,
|
EventDispatcherInterface $eventDispatcherInterface,
|
||||||
|
@ -97,7 +93,6 @@ class ViewController extends Controller {
|
||||||
$this->appName = $appName;
|
$this->appName = $appName;
|
||||||
$this->request = $request;
|
$this->request = $request;
|
||||||
$this->urlGenerator = $urlGenerator;
|
$this->urlGenerator = $urlGenerator;
|
||||||
$this->navigationManager = $navigationManager;
|
|
||||||
$this->l10n = $l10n;
|
$this->l10n = $l10n;
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
$this->eventDispatcher = $eventDispatcherInterface;
|
$this->eventDispatcher = $eventDispatcherInterface;
|
||||||
|
@ -244,7 +239,6 @@ class ViewController extends Controller {
|
||||||
$params['fileNotFound'] = $fileNotFound ? 1 : 0;
|
$params['fileNotFound'] = $fileNotFound ? 1 : 0;
|
||||||
$params['appNavigation'] = $nav;
|
$params['appNavigation'] = $nav;
|
||||||
$params['appContents'] = $contentItems;
|
$params['appContents'] = $contentItems;
|
||||||
$this->navigationManager->setActiveEntry('files_index');
|
|
||||||
|
|
||||||
$response = new TemplateResponse(
|
$response = new TemplateResponse(
|
||||||
$this->appName,
|
$this->appName,
|
||||||
|
|
|
@ -33,8 +33,6 @@ use OCP\Template;
|
||||||
use Test\TestCase;
|
use Test\TestCase;
|
||||||
use OCP\IRequest;
|
use OCP\IRequest;
|
||||||
use OCP\IURLGenerator;
|
use OCP\IURLGenerator;
|
||||||
use OCP\AppFramework\Http\RedirectResponse;
|
|
||||||
use OCP\INavigationManager;
|
|
||||||
use OCP\IL10N;
|
use OCP\IL10N;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
use OCP\IUserSession;
|
use OCP\IUserSession;
|
||||||
|
@ -51,8 +49,6 @@ class ViewControllerTest extends TestCase {
|
||||||
private $request;
|
private $request;
|
||||||
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
|
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
private $urlGenerator;
|
private $urlGenerator;
|
||||||
/** @var INavigationManager */
|
|
||||||
private $navigationManager;
|
|
||||||
/** @var IL10N */
|
/** @var IL10N */
|
||||||
private $l10n;
|
private $l10n;
|
||||||
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
|
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
@ -74,7 +70,6 @@ class ViewControllerTest extends TestCase {
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->request = $this->getMockBuilder('\OCP\IRequest')->getMock();
|
$this->request = $this->getMockBuilder('\OCP\IRequest')->getMock();
|
||||||
$this->urlGenerator = $this->getMockBuilder('\OCP\IURLGenerator')->getMock();
|
$this->urlGenerator = $this->getMockBuilder('\OCP\IURLGenerator')->getMock();
|
||||||
$this->navigationManager = $this->getMockBuilder('\OCP\INavigationManager')->getMock();
|
|
||||||
$this->l10n = $this->getMockBuilder('\OCP\IL10N')->getMock();
|
$this->l10n = $this->getMockBuilder('\OCP\IL10N')->getMock();
|
||||||
$this->config = $this->getMockBuilder('\OCP\IConfig')->getMock();
|
$this->config = $this->getMockBuilder('\OCP\IConfig')->getMock();
|
||||||
$this->eventDispatcher = $this->getMockBuilder('\Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
|
$this->eventDispatcher = $this->getMockBuilder('\Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
|
||||||
|
@ -93,7 +88,6 @@ class ViewControllerTest extends TestCase {
|
||||||
'files',
|
'files',
|
||||||
$this->request,
|
$this->request,
|
||||||
$this->urlGenerator,
|
$this->urlGenerator,
|
||||||
$this->navigationManager,
|
|
||||||
$this->l10n,
|
$this->l10n,
|
||||||
$this->config,
|
$this->config,
|
||||||
$this->eventDispatcher,
|
$this->eventDispatcher,
|
||||||
|
|
Loading…
Reference in New Issue