mirror of
https://github.com/espocrm/espocrm.git
synced 2026-06-28 06:56:05 +00:00
Merge branch 'fix'
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
{{#if url}}
|
||||
{{#if iconHtml}}{{{iconHtml}}}{{/if}}<a href="{{url}}">{{nameValue}}</a>
|
||||
{{#if iconHtml}}{{{iconHtml}}}{{/if}}<a href="{{url}}" class="{{#if linkClass}}{{linkClass}}{{/if}}">{{nameValue}}</a>
|
||||
{{else}}
|
||||
{{#if valueIsSet}}
|
||||
<span class="none-value">{{translate 'None'}}</span>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{{#if idValue}}
|
||||
{{{avatar}}}<a href="#{{foreignScope}}/view/{{idValue}}">{{nameValue}}</a>
|
||||
{{{avatar}}}<a href="#{{foreignScope}}/view/{{idValue}}" class="text-default">{{nameValue}}</a>
|
||||
{{else}}
|
||||
<span class="none-value">{{translate 'None'}}</span>
|
||||
{{/if}}
|
||||
|
||||
@@ -30,6 +30,8 @@ import LinkMultipleFieldView from 'views/fields/link-multiple';
|
||||
|
||||
class AssignedUsersFieldView extends LinkMultipleFieldView {
|
||||
|
||||
linkClass = 'text-default'
|
||||
|
||||
init() {
|
||||
this.assignmentPermission = this.getAcl().getPermissionLevel('assignmentPermission');
|
||||
|
||||
|
||||
@@ -30,6 +30,8 @@ import LinkMultipleFieldView from 'views/fields/link-multiple';
|
||||
|
||||
export default class CollaboratorsFieldView extends LinkMultipleFieldView {
|
||||
|
||||
linkClass = 'text-default'
|
||||
|
||||
init() {
|
||||
this.assignmentPermission = this.getAcl().getPermissionLevel('assignmentPermission');
|
||||
|
||||
|
||||
@@ -32,6 +32,7 @@ class FollowersFieldView extends LinkMultipleFieldView {
|
||||
|
||||
foreignScope = 'User'
|
||||
portionSize = 6
|
||||
linkClass = 'text-default'
|
||||
|
||||
setup() {
|
||||
super.setup();
|
||||
|
||||
@@ -76,7 +76,6 @@ class LinkMultipleFieldView extends BaseFieldView {
|
||||
editTemplate = 'fields/link-multiple/edit'
|
||||
searchTemplate = 'fields/link-multiple/search'
|
||||
|
||||
|
||||
// noinspection JSUnusedGlobalSymbols
|
||||
listLinkTemplateContent = `
|
||||
{{#if value}}
|
||||
@@ -247,6 +246,14 @@ class LinkMultipleFieldView extends BaseFieldView {
|
||||
*/
|
||||
iconHtml = ''
|
||||
|
||||
/**
|
||||
* A link element class name. Applicable in the detail mode.
|
||||
*
|
||||
* @protected
|
||||
* @since 9.1.6
|
||||
*/
|
||||
linkClass
|
||||
|
||||
/** @inheritDoc */
|
||||
events = {
|
||||
/** @this LinkMultipleFieldView */
|
||||
@@ -834,6 +841,8 @@ class LinkMultipleFieldView extends BaseFieldView {
|
||||
|
||||
if (this.mode === this.MODE_LIST) {
|
||||
$a.addClass('text-default');
|
||||
} else if (this.linkClass) {
|
||||
$a.addClass(this.linkClass);
|
||||
}
|
||||
|
||||
if (iconHtml) {
|
||||
|
||||
@@ -209,6 +209,14 @@ class LinkFieldView extends BaseFieldView {
|
||||
*/
|
||||
autocompleteOnEmpty = false
|
||||
|
||||
/**
|
||||
* A link element class name. Applicable in the detail mode.
|
||||
*
|
||||
* @protected
|
||||
* @since 9.1.6
|
||||
*/
|
||||
linkClass
|
||||
|
||||
/** @inheritDoc */
|
||||
events = {
|
||||
/** @this LinkFieldView */
|
||||
@@ -265,6 +273,7 @@ class LinkFieldView extends BaseFieldView {
|
||||
iconHtml: iconHtml,
|
||||
url: this.getUrl(),
|
||||
createButton: createButton,
|
||||
linkClass: this.linkClass,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -32,6 +32,7 @@ import Autocomplete from 'ui/autocomplete';
|
||||
class UserFieldView extends LinkFieldView {
|
||||
|
||||
searchTemplate = 'fields/user/search'
|
||||
linkClass = 'text-default'
|
||||
|
||||
setupSearch() {
|
||||
super.setupSearch();
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
************************************************************************/
|
||||
|
||||
import View from 'view';
|
||||
import Collection from 'collection';
|
||||
import ListRecordView from 'views/record/list';
|
||||
import ReactionsHelper from 'helpers/misc/reactions';
|
||||
|
||||
@@ -42,7 +41,7 @@ export default class NoteReactionsView extends View {
|
||||
title="{{label}}"
|
||||
data-type="{{type}}"
|
||||
>
|
||||
<span data-role="icon" class="{{iconClass}} {{#if reacted}} text-primary {{/if}}"></span>
|
||||
<span data-role="icon" class="{{iconClass}} {{#if reacted}} text-warning {{/if}}"></span>
|
||||
<span data-role="count">{{count}}</span>
|
||||
</a>
|
||||
{{/each}}
|
||||
|
||||
@@ -2369,13 +2369,18 @@ td > span.color-icon {
|
||||
span.text-primary {
|
||||
color: var(--link-hover-color);
|
||||
}
|
||||
|
||||
span.text-primary {
|
||||
color: var(--link-hover-color);
|
||||
}
|
||||
|
||||
span.text-warning {
|
||||
color: var(--state-warning-text-10);
|
||||
}
|
||||
}
|
||||
|
||||
text-align: right;
|
||||
min-width: var(--30px);
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4102,21 +4107,36 @@ body > .autocomplete-suggestions.text-search-suggestions {
|
||||
width: var(--220px);
|
||||
}
|
||||
|
||||
&:has(.popover-content > .list > table) {
|
||||
padding-left: 0;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
.popover-content {
|
||||
&:has(> .list > table) {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
> .list > table > tbody {
|
||||
> tr {
|
||||
> td:first-child {
|
||||
padding-left: var(--14px);
|
||||
}
|
||||
> .list > table {
|
||||
> tbody {
|
||||
> tr {
|
||||
> td:first-child {
|
||||
padding-left: var(--14px);
|
||||
}
|
||||
|
||||
> td:last-child {
|
||||
padding-right: var(--14px);
|
||||
> td:last-child {
|
||||
padding-right: var(--14px);
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
> td {
|
||||
border-left: 0;
|
||||
border-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
background-color: unset;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user