mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-11-03 03:16:10 -06:00 
			
		
		
		
	Fix: fix display of permissions filter users dropdown
This commit is contained in:
		@@ -2322,7 +2322,7 @@
 | 
				
			|||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
        <context-group purpose="location">
 | 
					        <context-group purpose="location">
 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.html</context>
 | 
					          <context context-type="sourcefile">src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.html</context>
 | 
				
			||||||
          <context context-type="linenumber">77</context>
 | 
					          <context context-type="linenumber">76</context>
 | 
				
			||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="2941198503117307737" datatype="html">
 | 
					      <trans-unit id="2941198503117307737" datatype="html">
 | 
				
			||||||
@@ -4930,7 +4930,7 @@
 | 
				
			|||||||
        <source>Hide unowned</source>
 | 
					        <source>Hide unowned</source>
 | 
				
			||||||
        <context-group purpose="location">
 | 
					        <context-group purpose="location">
 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.html</context>
 | 
					          <context context-type="sourcefile">src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.html</context>
 | 
				
			||||||
          <context context-type="linenumber">88</context>
 | 
					          <context context-type="linenumber">86</context>
 | 
				
			||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="941924371433275463" datatype="html">
 | 
					      <trans-unit id="941924371433275463" datatype="html">
 | 
				
			||||||
@@ -7098,9 +7098,7 @@
 | 
				
			|||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="5195932016807797291" datatype="html">
 | 
					      <trans-unit id="5195932016807797291" datatype="html">
 | 
				
			||||||
        <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find(
 | 
					        <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source>
 | 
				
			||||||
              (c) => c.id == +rule.value
 | 
					 | 
				
			||||||
            )?.name"/></source>
 | 
					 | 
				
			||||||
        <context-group purpose="location">
 | 
					        <context-group purpose="location">
 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
					          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
				
			||||||
          <context context-type="linenumber">191,193</context>
 | 
					          <context context-type="linenumber">191,193</context>
 | 
				
			||||||
@@ -7114,9 +7112,7 @@
 | 
				
			|||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="317796810569008208" datatype="html">
 | 
					      <trans-unit id="317796810569008208" datatype="html">
 | 
				
			||||||
        <source>Document type: <x id="PH" equiv-text="this.documentTypes.find(
 | 
					        <source>Document type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source>
 | 
				
			||||||
              (dt) => dt.id == +rule.value
 | 
					 | 
				
			||||||
            )?.name"/></source>
 | 
					 | 
				
			||||||
        <context-group purpose="location">
 | 
					        <context-group purpose="location">
 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
					          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
				
			||||||
          <context context-type="linenumber">201,203</context>
 | 
					          <context context-type="linenumber">201,203</context>
 | 
				
			||||||
@@ -7130,9 +7126,7 @@
 | 
				
			|||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="232202047340644471" datatype="html">
 | 
					      <trans-unit id="232202047340644471" datatype="html">
 | 
				
			||||||
        <source>Storage path: <x id="PH" equiv-text="this.storagePaths.find(
 | 
					        <source>Storage path: <x id="PH" equiv-text="this.storagePaths.find((sp) => sp.id == +rule.value)?.name"/></source>
 | 
				
			||||||
              (sp) => sp.id == +rule.value
 | 
					 | 
				
			||||||
            )?.name"/></source>
 | 
					 | 
				
			||||||
        <context-group purpose="location">
 | 
					        <context-group purpose="location">
 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
					          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
				
			||||||
          <context context-type="linenumber">211,213</context>
 | 
					          <context context-type="linenumber">211,213</context>
 | 
				
			||||||
@@ -7146,69 +7140,66 @@
 | 
				
			|||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="8180755793012580465" datatype="html">
 | 
					      <trans-unit id="8180755793012580465" datatype="html">
 | 
				
			||||||
        <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)
 | 
					        <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source>
 | 
				
			||||||
            ?.name"/></source>
 | 
					 | 
				
			||||||
        <context-group purpose="location">
 | 
					        <context-group purpose="location">
 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
					          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
				
			||||||
          <context context-type="linenumber">219,220</context>
 | 
					          <context context-type="linenumber">219,221</context>
 | 
				
			||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="6494566478302448576" datatype="html">
 | 
					      <trans-unit id="6494566478302448576" datatype="html">
 | 
				
			||||||
        <source>Without any tag</source>
 | 
					        <source>Without any tag</source>
 | 
				
			||||||
        <context-group purpose="location">
 | 
					        <context-group purpose="location">
 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
					          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
				
			||||||
          <context context-type="linenumber">224</context>
 | 
					          <context context-type="linenumber">225</context>
 | 
				
			||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="6370692707013694620" datatype="html">
 | 
					      <trans-unit id="6370692707013694620" datatype="html">
 | 
				
			||||||
        <source>Custom fields: <x id="PH" equiv-text="this.customFields.find(
 | 
					        <source>Custom fields: <x id="PH" equiv-text="this.customFields.find((f) => f.id == +rule.value)?.name"/></source>
 | 
				
			||||||
            (f) => f.id == +rule.value
 | 
					 | 
				
			||||||
          )?.name"/></source>
 | 
					 | 
				
			||||||
        <context-group purpose="location">
 | 
					        <context-group purpose="location">
 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
					          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
				
			||||||
          <context context-type="linenumber">228,230</context>
 | 
					          <context context-type="linenumber">229,231</context>
 | 
				
			||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="5297600960590041873" datatype="html">
 | 
					      <trans-unit id="5297600960590041873" datatype="html">
 | 
				
			||||||
        <source>Without any custom field</source>
 | 
					        <source>Without any custom field</source>
 | 
				
			||||||
        <context-group purpose="location">
 | 
					        <context-group purpose="location">
 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
					          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
				
			||||||
          <context context-type="linenumber">234</context>
 | 
					          <context context-type="linenumber">235</context>
 | 
				
			||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="6523384805359286307" datatype="html">
 | 
					      <trans-unit id="6523384805359286307" datatype="html">
 | 
				
			||||||
        <source>Title: <x id="PH" equiv-text="rule.value"/></source>
 | 
					        <source>Title: <x id="PH" equiv-text="rule.value"/></source>
 | 
				
			||||||
        <context-group purpose="location">
 | 
					        <context-group purpose="location">
 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
					          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
				
			||||||
          <context context-type="linenumber">238</context>
 | 
					          <context context-type="linenumber">239</context>
 | 
				
			||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="1872523635812236432" datatype="html">
 | 
					      <trans-unit id="1872523635812236432" datatype="html">
 | 
				
			||||||
        <source>ASN: <x id="PH" equiv-text="rule.value"/></source>
 | 
					        <source>ASN: <x id="PH" equiv-text="rule.value"/></source>
 | 
				
			||||||
        <context-group purpose="location">
 | 
					        <context-group purpose="location">
 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
					          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
				
			||||||
          <context context-type="linenumber">241</context>
 | 
					          <context context-type="linenumber">242</context>
 | 
				
			||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="102674688969746976" datatype="html">
 | 
					      <trans-unit id="102674688969746976" datatype="html">
 | 
				
			||||||
        <source>Owner: <x id="PH" equiv-text="rule.value"/></source>
 | 
					        <source>Owner: <x id="PH" equiv-text="rule.value"/></source>
 | 
				
			||||||
        <context-group purpose="location">
 | 
					        <context-group purpose="location">
 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
					          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
				
			||||||
          <context context-type="linenumber">244</context>
 | 
					          <context context-type="linenumber">245</context>
 | 
				
			||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="3550877650686009106" datatype="html">
 | 
					      <trans-unit id="3550877650686009106" datatype="html">
 | 
				
			||||||
        <source>Owner not in: <x id="PH" equiv-text="rule.value"/></source>
 | 
					        <source>Owner not in: <x id="PH" equiv-text="rule.value"/></source>
 | 
				
			||||||
        <context-group purpose="location">
 | 
					        <context-group purpose="location">
 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
					          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
				
			||||||
          <context context-type="linenumber">247</context>
 | 
					          <context context-type="linenumber">248</context>
 | 
				
			||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="1082034558646673343" datatype="html">
 | 
					      <trans-unit id="1082034558646673343" datatype="html">
 | 
				
			||||||
        <source>Without an owner</source>
 | 
					        <source>Without an owner</source>
 | 
				
			||||||
        <context-group purpose="location">
 | 
					        <context-group purpose="location">
 | 
				
			||||||
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
					          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
 | 
				
			||||||
          <context context-type="linenumber">250</context>
 | 
					          <context context-type="linenumber">251</context>
 | 
				
			||||||
        </context-group>
 | 
					        </context-group>
 | 
				
			||||||
      </trans-unit>
 | 
					      </trans-unit>
 | 
				
			||||||
      <trans-unit id="7210076240260527720" datatype="html">
 | 
					      <trans-unit id="7210076240260527720" datatype="html">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -56,30 +56,28 @@
 | 
				
			|||||||
          <small i18n>Unowned</small>
 | 
					          <small i18n>Unowned</small>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
      </button>
 | 
					      </button>
 | 
				
			||||||
      <button *pngxIfPermissions="{ action: PermissionAction.Add, type: PermissionType.User }" class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-start-0 border-end-0 border-bottom" role="menuitem" [disabled]="disabled">
 | 
					      <button *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.User }" class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-start-0 border-end-0 border-bottom" role="menuitem" [disabled]="disabled">
 | 
				
			||||||
        <div class="selected-icon me-1">
 | 
					        <div class="selected-icon me-1">
 | 
				
			||||||
          @if (selectionModel.ownerFilter === OwnerFilterType.OTHERS) {
 | 
					          @if (selectionModel.ownerFilter === OwnerFilterType.OTHERS) {
 | 
				
			||||||
            <i-bs width="1em" height="1em" name="check"></i-bs>
 | 
					            <i-bs width="1em" height="1em" name="check"></i-bs>
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.User)) {
 | 
					        <div class="me-1 w-100">
 | 
				
			||||||
          <div class="me-1 w-100">
 | 
					          <ng-select
 | 
				
			||||||
            <ng-select
 | 
					            name="user"
 | 
				
			||||||
              name="user"
 | 
					            class="user-select small"
 | 
				
			||||||
              class="user-select small"
 | 
					            [(ngModel)]="selectionModel.includeUsers"
 | 
				
			||||||
              [(ngModel)]="selectionModel.includeUsers"
 | 
					            [disabled]="disabled"
 | 
				
			||||||
              [disabled]="disabled"
 | 
					            [clearable]="false"
 | 
				
			||||||
              [clearable]="false"
 | 
					            [items]="users"
 | 
				
			||||||
              [items]="users"
 | 
					            bindLabel="username"
 | 
				
			||||||
              bindLabel="username"
 | 
					            multiple="true"
 | 
				
			||||||
              multiple="true"
 | 
					            bindValue="id"
 | 
				
			||||||
              bindValue="id"
 | 
					            placeholder="Users"
 | 
				
			||||||
              placeholder="Users"
 | 
					            i18n-placeholder
 | 
				
			||||||
              i18n-placeholder
 | 
					            (change)="onUserSelect()">
 | 
				
			||||||
              (change)="onUserSelect()">
 | 
					          </ng-select>
 | 
				
			||||||
            </ng-select>
 | 
					        </div>
 | 
				
			||||||
          </div>
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
      </button>
 | 
					      </button>
 | 
				
			||||||
      @if (selectionModel.ownerFilter === OwnerFilterType.NONE || selectionModel.ownerFilter === OwnerFilterType.NOT_SELF) {
 | 
					      @if (selectionModel.ownerFilter === OwnerFilterType.NONE || selectionModel.ownerFilter === OwnerFilterType.NOT_SELF) {
 | 
				
			||||||
        <div class="list-group-item list-group-item-action d-flex align-items-center p-2 ps-3 border-bottom-0 border-start-0 border-end-0">
 | 
					        <div class="list-group-item list-group-item-action d-flex align-items-center p-2 ps-3 border-bottom-0 border-start-0 border-end-0">
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user