github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-14 10:36:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added some wiki pages and also made it so we cannot edit Plex Users email address (since they will get overwrote via the Importer)

Browse source 
#865
This commit is contained in:
Jamie.Rees 2017-09-29 14:26:49 +01:00
commit 6588fa8ca3
11 changed files with 57 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Ombi/ClientApp/app/services/job.service.ts
View file

@ -24,4 +24,8 @@ export class JobService extends ServiceAuthHelpers {
public runPlexImporter(): Observable<boolean> {
return this.http.post(`${this.url}plexUserImporter/`, { headers: this.headers }).map(this.extractData);
}
public runEmbyImporter(): Observable<boolean> {
return this.http.post(`${this.url}embyUserImporter/`, { headers: this.headers }).map(this.extractData);
}
}

31
src/Ombi/ClientApp/app/settings/customization/customization.component.html
View file

@ -1,35 +1,30 @@
<settings-menu></settings-menu>
<fieldset *ngIf="settings">
<legend>Customization</legend>
<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Customization-Settings'"></wiki>
<fieldset *ngIf="settings">
<legend>Customization</legend>
<div class="col-md-6">
<div class="form-group">
<label for="applicationName" class="control-label">Application Name</label>
<div>
<input type="text" [(ngModel)]="settings.applicationName" class="form-control form-control-custom " id="applicationName" name="applicationName" placeholder="Ombi" value="{{settings.applicationName}}">
</div>
</div>
<div class="form-group">
<label for="applicationurl" class="control-label">Application URL</label>
<div>
<input type="text" [(ngModel)]="settings.applicationurl" class="form-control form-control-custom " id="applicationurl" name="applicationurl" placeholder="http://ombi.io/" value="{{settings.applicationurl}}">
</div>
</div>
<div class="form-group">
<label for="logo" class="control-label">Custom Logo</label>
<div>
<input type="text" [(ngModel)]="settings.logo" class="form-control form-control-custom " id="logo" name="logo" value="{{settings.logo}}" tooltipPosition="top" pTooltip="Use a URL e.g. www.google.com/logo.png">
</div>
</div>
<div class="form-group">
<label for="logo" class="control-label">Logo Preview:</label>
<div>
<img *ngIf="settings.logo" [src]="settings.logo" style="width: 300px"/>
</div>
</div>
<div class="form-group">
@ -37,4 +32,16 @@
<button (click)="save()" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div>
</div>
</fieldset>
</div>
<div class="col-md-6">
<div *ngIf="settings.logo" class="form-group">
<label for="logo" class="control-label">Logo Preview:</label>
<div>
<img [src]="settings.logo" style="width: 300px" />
</div>
</div>
</div>
</fieldset>

2
src/Ombi/ClientApp/app/settings/landingpage/landingpage.component.html
View file

@ -1,5 +1,7 @@

<settings-menu></settings-menu>
<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Landing-Page-Settings'"></wiki>
<div *ngIf="settings">
<fieldset>
<legend>Landing Page Configuration</legend>

1
src/Ombi/ClientApp/app/settings/ombi/ombi.component.html
View file

@ -1,5 +1,6 @@
<settings-menu></settings-menu>
<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Ombi-Settings'"></wiki>
<fieldset *ngIf="form">
<legend>Ombi Configuration</legend>
<form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">

2
src/Ombi/ClientApp/app/settings/settings.module.ts
View file

@ -28,6 +28,7 @@ import { RadarrComponent } from "./radarr/radarr.component";
import { SonarrComponent } from "./sonarr/sonarr.component";
import { UpdateComponent } from "./update/update.component";
import { UserManagementComponent } from "./usermanagement/usermanagement.component";
import { WikiComponent } from "./wiki.component";
import { SettingsMenuComponent } from "./settingsmenu.component";
@ -89,6 +90,7 @@ const routes: Routes = [
UserManagementComponent,
UpdateComponent,
AboutComponent,
WikiComponent,
],
exports: [
RouterModule,

2
src/Ombi/ClientApp/app/settings/usermanagement/usermanagement.component.html
View file

@ -1,4 +1,6 @@
<settings-menu></settings-menu>
<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/User-Management-Settings'"></wiki>
<fieldset>
<legend>User Management Settings</legend>

1
src/Ombi/ClientApp/app/settings/usermanagement/usermanagement.component.ts
View file

@ -102,6 +102,7 @@ export class UserManagementComponent implements OnInit {
public runImporter(): void {
this.jobService.runPlexImporter().subscribe();
this.jobService.runPlexImporter().subscribe();
}
private filter(query: string, users: IUsersModel[]): IUsersModel[] {

5
src/Ombi/ClientApp/app/settings/wiki.component.html Normal file
View file

@ -0,0 +1,5 @@
<div class="col-md-12">
<div class="col-md-1 col-md-push-11">
<a href="{{url}}" target="_blank" class="btn btn-sm btn-info-outline">Wiki</a>
</div>
</div>

9
src/Ombi/ClientApp/app/settings/wiki.component.ts Normal file
View file

@ -0,0 +1,9 @@
import { Component, Input } from "@angular/core";
@Component({
selector:"wiki",
templateUrl: "./wiki.component.html",
})
export class WikiComponent {
@Input() public url: string;
}

2
src/Ombi/ClientApp/app/usermanagement/usermanagement-edit.component.html
View file

@ -27,7 +27,7 @@
<div class="form-group">
<label for="alias" class="control-label">Email Address</label>
<div>
<input type="text" [(ngModel)]="user.emailAddress" class="form-control form-control-custom " id="emailAddress" name="emailAddress" value="{{user?.emailAddress}}" [disabled]="user?.userType != 1">
<input type="text" [(ngModel)]="user.emailAddress" class="form-control form-control-custom " id="emailAddress" name="emailAddress" value="{{user?.emailAddress}}" [disabled]="user?.userType == 2">
</div>
</div>
</div>

12
src/Ombi/Controllers/JobController.cs
View file

@ -6,6 +6,7 @@ using Microsoft.Extensions.Caching.Memory;
using Ombi.Api.Service;
using Ombi.Attributes;
using Ombi.Helpers;
using Ombi.Schedule.Jobs.Emby;
using Ombi.Schedule.Jobs.Plex;
using Ombi.Schedule.Ombi;
@ -17,15 +18,17 @@ namespace Ombi.Controllers
public class JobController : Controller
{
public JobController(IOmbiAutomaticUpdater updater, IPlexUserImporter userImporter,
IMemoryCache mem)
IMemoryCache mem, IEmbyUserImporter embyImporter)
{
_updater = updater;
_plexUserImporter = userImporter;
_embyUserImporter = embyImporter;
_memCache = mem;
}
private readonly IOmbiAutomaticUpdater _updater;
private readonly IPlexUserImporter _plexUserImporter;
private readonly IEmbyUserImporter _embyUserImporter;
private readonly IMemoryCache _memCache;
[HttpPost("update")]
@ -68,5 +71,12 @@ namespace Ombi.Controllers
BackgroundJob.Enqueue(() => _plexUserImporter.Start());
return true;
}
[HttpPost("embyuserimporter")]
public bool EmbyUserImporter()
{
BackgroundJob.Enqueue(() => _embyUserImporter.Start());
return true;
}
}
}