diff --git a/app/Models/Setting.php b/app/Models/Setting.php index 0f3cb48039..c2ba250837 100755 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -14,35 +14,35 @@ class Setting extends Model protected $rules = [ "brand" => 'required|min:1|numeric', - "qr_text" => 'max:31', + "qr_text" => 'max:31|nullable', "logo_img" => 'mimes:jpeg,bmp,png,gif', - "alert_email" => 'email_array', + "alert_email" => 'email_array|nullable', "default_currency" => 'required', "locale" => 'required', - "slack_endpoint" => 'url|required_with:slack_channel', - "slack_channel" => 'regex:/(? 'url|required_with:slack_channel|nullable', + "slack_channel" => 'regex:/(? 'string|nullable', 'labels_per_page' => 'numeric', 'labels_width' => 'numeric', 'labels_height' => 'numeric', - 'labels_pmargin_left' => 'numeric', - 'labels_pmargin_right' => 'numeric', - 'labels_pmargin_top' => 'numeric', - 'labels_pmargin_bottom' => 'numeric', - 'labels_display_bgutter' => 'numeric', - 'labels_display_sgutter' => 'numeric', + 'labels_pmargin_left' => 'numeric|nullable', + 'labels_pmargin_right' => 'numeric|nullable', + 'labels_pmargin_top' => 'numeric|nullable', + 'labels_pmargin_bottom' => 'numeric|nullable', + 'labels_display_bgutter' => 'numeric|nullable', + 'labels_display_sgutter' => 'numeric|nullable', 'labels_fontsize' => 'numeric|min:5', - 'labels_pagewidth' => 'numeric', - 'labels_pageheight' => 'numeric', - "ldap_server" => 'sometimes|required_if:ldap_enabled,1|url', - "ldap_uname" => 'sometimes|required_if:ldap_enabled,1', - "ldap_basedn" => 'sometimes|required_if:ldap_enabled,1', - "ldap_filter" => 'sometimes|required_if:ldap_enabled,1', - "ldap_username_field" => 'sometimes|required_if:ldap_enabled,1', - "ldap_fname_field" => 'sometimes|required_if:ldap_enabled,1', - "ldap_lname_field" => 'sometimes|required_if:ldap_enabled,1', - "ldap_auth_filter_query" => 'sometimes|required_if:ldap_enabled,1', - "ldap_version" => 'sometimes|required_if:ldap_enabled,1', + 'labels_pagewidth' => 'numeric|nullable', + 'labels_pageheight' => 'numeric|nullable', + "ldap_server" => 'sometimes|required_if:ldap_enabled,1|url|nullable', + "ldap_uname" => 'sometimes|required_if:ldap_enabled,1|nullable', + "ldap_basedn" => 'sometimes|required_if:ldap_enabled,1|nullable', + "ldap_filter" => 'sometimes|required_if:ldap_enabled,1|nullable', + "ldap_username_field" => 'sometimes|required_if:ldap_enabled,1|nullable', + "ldap_fname_field" => 'sometimes|required_if:ldap_enabled,1|nullable', + "ldap_lname_field" => 'sometimes|required_if:ldap_enabled,1|nullable', + "ldap_auth_filter_query" => 'sometimes|required_if:ldap_enabled,1|nullable', + "ldap_version" => 'sometimes|required_if:ldap_enabled,1|nullable', "thumbnail_max_h" => 'numeric|max:500|min:25', ];