Skip to content

Fix app name of files app #3487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 1 commit into from
Feb 15, 2017
Merged

Fix app name of files app #3487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/files/lib/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ public function __construct(array $urlParams=array()) {
$c->query('AppName'),
$c->query('Request'),
$server->getURLGenerator(),
$server->getNavigationManager(),
$c->query('L10N'),
$server->getConfig(),
$server->getEventDispatcher(),
Expand Down
6 changes: 0 additions & 6 deletions apps/files/lib/Controller/ViewController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ class ViewController extends Controller {
protected $request;
/** @var IURLGenerator */
protected $urlGenerator;
/** @var INavigationManager */
protected $navigationManager;
/** @var IL10N */
protected $l10n;
/** @var IConfig */
Expand All @@ -74,7 +72,6 @@ class ViewController extends Controller {
* @param string $appName
* @param IRequest $request
* @param IURLGenerator $urlGenerator
* @param INavigationManager $navigationManager
* @param IL10N $l10n
* @param IConfig $config
* @param EventDispatcherInterface $eventDispatcherInterface
Expand All @@ -85,7 +82,6 @@ class ViewController extends Controller {
public function __construct($appName,
IRequest $request,
IURLGenerator $urlGenerator,
INavigationManager $navigationManager,
IL10N $l10n,
IConfig $config,
EventDispatcherInterface $eventDispatcherInterface,
Expand All @@ -97,7 +93,6 @@ public function __construct($appName,
$this->appName = $appName;
$this->request = $request;
$this->urlGenerator = $urlGenerator;
$this->navigationManager = $navigationManager;
$this->l10n = $l10n;
$this->config = $config;
$this->eventDispatcher = $eventDispatcherInterface;
Expand Down Expand Up @@ -244,7 +239,6 @@ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = fal
$params['fileNotFound'] = $fileNotFound ? 1 : 0;
$params['appNavigation'] = $nav;
$params['appContents'] = $contentItems;
$this->navigationManager->setActiveEntry('files_index');

$response = new TemplateResponse(
$this->appName,
Expand Down
6 changes: 0 additions & 6 deletions apps/files/tests/Controller/ViewControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
use Test\TestCase;
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\INavigationManager;
use OCP\IL10N;
use OCP\IConfig;
use OCP\IUserSession;
Expand All @@ -51,8 +49,6 @@ class ViewControllerTest extends TestCase {
private $request;
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
private $urlGenerator;
/** @var INavigationManager */
private $navigationManager;
/** @var IL10N */
private $l10n;
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
Expand All @@ -74,7 +70,6 @@ public function setUp() {
parent::setUp();
$this->request = $this->getMockBuilder('\OCP\IRequest')->getMock();
$this->urlGenerator = $this->getMockBuilder('\OCP\IURLGenerator')->getMock();
$this->navigationManager = $this->getMockBuilder('\OCP\INavigationManager')->getMock();
$this->l10n = $this->getMockBuilder('\OCP\IL10N')->getMock();
$this->config = $this->getMockBuilder('\OCP\IConfig')->getMock();
$this->eventDispatcher = $this->getMockBuilder('\Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
Expand All @@ -93,7 +88,6 @@ public function setUp() {
'files',
$this->request,
$this->urlGenerator,
$this->navigationManager,
$this->l10n,
$this->config,
$this->eventDispatcher,
Expand Down