| {{ tag.name }} |
- {{ getColor(tag.colour).name }} |
+ {{tag.color}} |
{{ getMatching(tag) }} |
{{ tag.document_count }} |
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
index ac468c46b..7ea379f64 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
@@ -1,7 +1,7 @@
import { Component } from '@angular/core';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { FILTER_HAS_TAG } from 'src/app/data/filter-rule-type';
-import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag';
+import { PaperlessTag } from 'src/app/data/paperless-tag';
import { DocumentListViewService } from 'src/app/services/document-list-view.service';
import { TagService } from 'src/app/services/rest/tag.service';
import { ToastService } from 'src/app/services/toast.service';
@@ -22,14 +22,6 @@ export class TagListComponent extends GenericListComponent {
super(tagService, modalService, TagEditDialogComponent, toastService)
}
- getColor(id) {
- var color = TAG_COLOURS.find(c => c.id == id)
- if (color) {
- return color
- }
- return { id: id, name: id, textColor: "#ffffff" }
- }
-
getDeleteMessage(object: PaperlessTag) {
return $localize`Do you really want to delete the tag "${object.name}"?`
}
diff --git a/src-ui/src/app/data/paperless-tag.ts b/src-ui/src/app/data/paperless-tag.ts
index 1518caa1f..a999666c4 100644
--- a/src-ui/src/app/data/paperless-tag.ts
+++ b/src-ui/src/app/data/paperless-tag.ts
@@ -1,27 +1,10 @@
-import { MatchingModel } from './matching-model';
-import { ObjectWithId } from './object-with-id';
-
-
-export const TAG_COLOURS = [
- { id: "", name: "Auto", textColor: "#000000" },
- { id: "#a6cee3", name: $localize`Light blue`, textColor: "#000000" },
- { id: "#1f78b4", name: $localize`Blue`, textColor: "#ffffff" },
- { id: "#b2df8a", name: $localize`Light green`, textColor: "#000000" },
- { id: "#33a02c", name: $localize`Green`, textColor: "#ffffff" },
- { id: "#fb9a99", name: $localize`Light red`, textColor: "#000000" },
- { id: "#e31a1c", name: $localize`Red `, textColor: "#ffffff" },
- { id: "#fdbf6f", name: $localize`Light orange`, textColor: "#000000" },
- { id: "#ff7f00", name: $localize`Orange`, textColor: "#000000" },
- { id: "#cab2d6", name: $localize`Light violet`, textColor: "#000000" },
- { id: "#6a3d9a", name: $localize`Violet`, textColor: "#ffffff" },
- { id: "#b15928", name: $localize`Brown`, textColor: "#ffffff" },
- { id: "#000000", name: $localize`Black`, textColor: "#ffffff" },
- { id: "#cccccc", name: $localize`Light grey`, textColor: "#000000" }
-]
+import { MatchingModel } from "./matching-model";
export interface PaperlessTag extends MatchingModel {
- colour?: string
+ color?: string
+
+ text_color?: string
is_inbox_tag?: boolean
diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts
index 50cf6d954..2d07ac31c 100644
--- a/src-ui/src/environments/environment.prod.ts
+++ b/src-ui/src/environments/environment.prod.ts
@@ -1,7 +1,7 @@
export const environment = {
production: true,
apiBaseUrl: "/api/",
- apiVersion: "1",
+ apiVersion: "2",
appTitle: "Paperless-ng",
version: "1.2.1",
webSocketHost: window.location.host,
diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts
index b0ac843d5..3d981b677 100644
--- a/src-ui/src/environments/environment.ts
+++ b/src-ui/src/environments/environment.ts
@@ -5,7 +5,7 @@
export const environment = {
production: false,
apiBaseUrl: "http://localhost:8000/api/",
- apiVersion: "1",
+ apiVersion: "2",
appTitle: "Paperless-ng",
version: "DEVELOPMENT",
webSocketHost: "localhost:8000",
|