Skip to content

Links on login pages #131

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
juliusknorr merged 3 commits into from
Feb 19, 2019
Merged

Links on login pages #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cbe613
Add public footer links
juliusknorr Feb 18, 2019
bce6cde
Allow to add external guest links
juliusknorr Feb 18, 2019
44b09b4
Update lib/Controller/APIController.php
nickvergessen Feb 18, 2019
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
8 changes: 8 additions & 0 deletions js/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@
_.each(this._sites.models, function(site) {
var $el = $(self._renderSite(site.attributes));
self._attachEvents($el);
if (site.attributes.type === 'guest') {
$el.find('.site-redirect-box').hide();
}
self.$list.append($el);
});
},
Expand Down Expand Up @@ -232,6 +235,11 @@

$site.removeClass('failure saved').addClass('saving');
$site.find('.invalid-value').removeClass('invalid-value');
if (data.type === 'guest') {
$site.find('.site-redirect-box').hide();
} else {
$site.find('.site-redirect-box').show();
}

if (!_.isUndefined(site)) {
site.save(data, {
Expand Down
2 changes: 1 addition & 1 deletion lib/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function register() {
*/
public function registerNavigationEntries(IServerContainer $server, array $sites) {
foreach ($sites as $id => $site) {
if ($site['type'] !== SitesManager::TYPE_LINK && $site['type'] !== SitesManager::TYPE_SETTING) {
if ($site['type'] !== SitesManager::TYPE_LINK && $site['type'] !== SitesManager::TYPE_SETTING && $site['type'] !== SitesManager::TYPE_LOGIN ) {
continue;
}

Expand Down
1 change: 1 addition & 0 deletions lib/Controller/APIController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ public function getAdmin() {
['type' => SitesManager::TYPE_LINK, 'name' => $this->l->t('Header')],
['type' => SitesManager::TYPE_SETTING, 'name' => $this->l->t('Setting menu')],
['type' => SitesManager::TYPE_QUOTA, 'name' => $this->l->t('User quota')],
['type' => SitesManager::TYPE_LOGIN, 'name' => $this->l->t('Public footer')],
];

$devices = [
Expand Down
13 changes: 11 additions & 2 deletions lib/SitesManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\INavigationManager;
use OCP\IRequest;
use OCP\IUser;
use OCP\IUserSession;
Expand Down Expand Up @@ -237,7 +238,7 @@ public function addSite($name, $url, $lang, $type, $device, $icon, array $groups
}
}

if (!in_array($type, [self::TYPE_LINK, self::TYPE_SETTING, self::TYPE_QUOTA], true)) {
if (!in_array($type, [self::TYPE_LINK, self::TYPE_SETTING, self::TYPE_QUOTA, INavigationManager::TYPE_GUEST], true)) {
throw new InvalidTypeException();
}

Expand All @@ -259,6 +260,10 @@ public function addSite($name, $url, $lang, $type, $device, $icon, array $groups
throw new IconNotFoundException();
}

if ($type === INavigationManager::TYPE_GUEST) {
$redirect = true;
}

$sites = $this->getSites();
$sites[$id] = [
'id' => $id,
Expand Down Expand Up @@ -326,7 +331,7 @@ public function updateSite($id, $name, $url, $lang, $type, $device, $icon, array
}
}

if (!in_array($type, [self::TYPE_LINK, self::TYPE_SETTING, self::TYPE_QUOTA], true)) {
if (!in_array($type, [self::TYPE_LINK, self::TYPE_SETTING, self::TYPE_QUOTA, INavigationManager::TYPE_GUEST], true)) {
throw new InvalidTypeException();
}

Expand All @@ -348,6 +353,10 @@ public function updateSite($id, $name, $url, $lang, $type, $device, $icon, array
throw new IconNotFoundException();
}

if ($type === INavigationManager::TYPE_GUEST) {
$redirect = true;
}

$sites[$id] = [
'id' => $id,
'name' => $name,
Expand Down