ソースを参照

Merge pull request #3003 from netchampfaris/list-view-fixes

List View fixes
version-14
Nabin Hait 8年前
committed by GitHub
コミット
ed3e7d725f
5個のファイルの変更13行の追加10行の削除
  1. +10
    -6
      frappe/custom/doctype/custom_script/custom_script.json
  2. +1
    -0
      frappe/public/css/list.css
  3. +1
    -1
      frappe/public/js/frappe/list/list_item_subject.html
  4. +0
    -3
      frappe/public/js/frappe/list/list_renderer.js
  5. +1
    -0
      frappe/public/less/list.less

+ 10
- 6
frappe/custom/doctype/custom_script/custom_script.json ファイルの表示

@@ -1,5 +1,6 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 1, "allow_import": 1,
"allow_rename": 0, "allow_rename": 0,
"autoname": "CustomScript.####", "autoname": "CustomScript.####",
@@ -24,6 +25,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_global_search": 0,
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 1, "in_standard_filter": 1,
"label": "DocType", "label": "DocType",
@@ -55,6 +57,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_global_search": 0,
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 1, "in_standard_filter": 1,
"label": "Script Type", "label": "Script Type",
@@ -84,7 +87,8 @@
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Script", "label": "Script",
@@ -115,6 +119,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Sample", "label": "Sample",
@@ -133,19 +138,19 @@
"unique": 0 "unique": 0
} }
], ],
"has_web_view": 0,
"hide_heading": 0, "hide_heading": 0,
"hide_toolbar": 0, "hide_toolbar": 0,
"icon": "fa fa-glass", "icon": "fa fa-glass",
"idx": 1, "idx": 1,
"image_view": 0, "image_view": 0,
"in_create": 0, "in_create": 0,
"in_dialog": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-12-29 14:40:24.037012",
"modified_by": "Administrator",
"modified": "2017-04-03 18:07:28.138437",
"modified_by": "faris@erpnext.com",
"module": "Custom", "module": "Custom",
"name": "Custom Script", "name": "Custom Script",
"owner": "Administrator", "owner": "Administrator",
@@ -160,7 +165,6 @@
"export": 0, "export": 0,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"is_custom": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
@@ -181,7 +185,6 @@
"export": 0, "export": 0,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"is_custom": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
@@ -196,6 +199,7 @@
"quick_entry": 0, "quick_entry": 0,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"show_name_in_global_search": 0,
"sort_order": "ASC", "sort_order": "ASC",
"track_changes": 1, "track_changes": 1,
"track_seen": 0 "track_seen": 0


+ 1
- 0
frappe/public/css/list.css ファイルの表示

@@ -420,6 +420,7 @@
.list-item input[type=checkbox] { .list-item input[type=checkbox] {
margin: 0; margin: 0;
margin-right: 5px; margin-right: 5px;
flex: 0 0 12px;
} }
.list-item .liked-by, .list-item .liked-by,
.list-item .liked-by-filter-button { .list-item .liked-by-filter-button {


+ 1
- 1
frappe/public/js/frappe/list/list_item_subject.html ファイルの表示

@@ -11,7 +11,7 @@
</i> </i>
<span class="likes-count">{{ (_liked_by.length > 99 ? "99+" : _liked_by.length) || "" }}</span> <span class="likes-count">{{ (_liked_by.length > 99 ? "99+" : _liked_by.length) || "" }}</span>
</span> </span>
<a class="grey list-id {{ css_seen }}"
<a class="grey list-id {{ css_seen }} ellipsis"
data-name="{{ _name }}" data-name="{{ _name }}"
href="#Form/{{ _doctype_encoded }}/{{ _name_encoded }}" href="#Form/{{ _doctype_encoded }}/{{ _name_encoded }}"
title="{{ _full_title }}">{{ strip_html(_title) }}</a> title="{{ _full_title }}">{{ strip_html(_title) }}</a>


+ 0
- 3
frappe/public/js/frappe/list/list_renderer.js ファイルの表示

@@ -447,9 +447,6 @@ frappe.views.ListRenderer = Class.extend({
data._title = strip_html(data[title_field] || data.name); data._title = strip_html(data[title_field] || data.name);
data._full_title = data._title; data._full_title = data._title;


if (data._title.length > 35) {
data._title = data._title.slice(0, 35) + '...';
}


data._workflow = null; data._workflow = null;
if (this.workflow_state_fieldname) { if (this.workflow_state_fieldname) {


+ 1
- 0
frappe/public/less/list.less ファイルの表示

@@ -514,6 +514,7 @@
input[type=checkbox] { input[type=checkbox] {
margin: 0; margin: 0;
margin-right: 5px; margin-right: 5px;
flex: 0 0 12px;
} }


.liked-by, .liked-by-filter-button { .liked-by, .liked-by-filter-button {


読み込み中…
キャンセル
保存