mirror of
				https://github.com/janeczku/calibre-web
				synced 2025-10-31 07:13:02 +00:00 
			
		
		
		
	Bugfix for edit custom ratings in list edit mode
Bugfix for deleting custom enum in list edit mode
This commit is contained in:
		| @@ -1096,6 +1096,7 @@ def table_get_custom_enum(c_id): | ||||
|     cc = (calibre_db.session.query(db.Custom_Columns) | ||||
|               .filter(db.Custom_Columns.id == c_id) | ||||
|               .filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).one_or_none()) | ||||
|     ret.append({'value': "", 'text': ""}) | ||||
|     for idx, en in enumerate(cc.get_display_dict()['enum_values']): | ||||
|         ret.append({'value': en, 'text': en}) | ||||
|     return json.dumps(ret) | ||||
|   | ||||
| @@ -645,6 +645,9 @@ function singlecheckboxFormatter(value, row){ | ||||
| } | ||||
|  | ||||
| function ratingFormatter(value, row) { | ||||
|     if (value == 0) { | ||||
|         return ""; | ||||
|     } | ||||
|     return (value/2); | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -76,7 +76,7 @@ | ||||
|               {% if c.datatype == "int" %} | ||||
|                 <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="1" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th> | ||||
|               {% elif c.datatype == "rating" %} | ||||
|                 <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-formatter="ratingFormatter" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="1" data-editable-min="0" data-editable-max="5" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th> | ||||
|                 <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-formatter="ratingFormatter" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.5" data-editable-step="1" data-editable-min="1" data-editable-max="5" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th> | ||||
|               {% elif c.datatype == "float" %} | ||||
|                 <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.01" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th> | ||||
|               {% elif c.datatype == "enumeration" %} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Ozzie Isaacs
					Ozzie Isaacs