Skip to content

remove error_handling from login docs EECORE-927 #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ops-andy merged 6 commits into from
Jan 4, 2021
Merged

remove error_handling from login docs EECORE-927 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5cd9c2d
remove error_handling from login docs EECORE-927
intoeetive Dec 21, 2020
1228e5a
remove `inline_errors` parameter from registration docs
intoeetive Dec 21, 2020
4155fb3
add custom member fields to registration template
intoeetive Dec 21, 2020
2da5c0f
move the 1-click update notice higher
intoeetive Dec 22, 2020
43ab473
fixed docs for `logged_in_primary_role_` variables EECORE-938
intoeetive Jan 4, 2021
b5f5eaa
corrected typo
Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/installation/updating.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ WARN: **Important** Upgrading major version (example from v5.x to v6.x) typicall

ExpressionEngine supports one-click updating as of **Version 4.0** or newer. If you are running a version older than 4, then you must perform a [manual update](#updating-manually).

NOTE: **Note:** If updating from a version prior to ExpressionEngine 6, you may need to rename or remove `system/ee/EllisLab` directory manually. You will also need to manually copy the [latest index.php and admin.php files](_downloads/EE6_Index_Admin.zip) to your site's root folder.

When an update is available, you'll see the version number in the control panel footer turn yellow or red. Click the version number, then click "Update Now".

**Upgrade Steps**
Expand All @@ -31,8 +33,6 @@ When an update is available, you'll see the version number in the control panel

In the rare case an update fails, please read [Troubleshooting Automatic Updates](troubleshooting/general.md#troubleshooting-automatic-updates).

NOTE: **Note:** If updating from a version prior to ExpressionEngine 6, you may need to rename or remove `system/ee/EllisLab` directory manually. You will also need to manually copy the [latest index.php and admin.php files](_downloads/EE6_Index_Admin.zip) to your site's root folder.


## Updating Via EECLI

Expand Down
37 changes: 1 addition & 36 deletions docs/member/login.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@ Output a login form.

Allows you to specify the action attribute of the <form> tag. Handy if you need to ensure that authentication points to SSL portions of your site from non-SSL portions. Often used in conjunction with the return= parameter and the [{current_url} global variable](templates/globals/single-variables.md#current_url) so your visitors will go back to the page and domain they logged in from.

### `error_handling=`

error_handling="inline"

Choose to display error messages inline (see [Error Messages](#errors)). By default, errors are displayed with the user message template.

### `form_class=`

form_class="login"
Expand Down Expand Up @@ -113,35 +107,6 @@ It is recommended that you use this variable as indicated in the example code at
{/if}



## Variable Pairs

### `{errors}`

Form submission errors are displayed using a "looping pair" as there can be more than 1 error in a form submission.

{errors}
<p>{error}</p>
{/errors}

#### Error Tag Pair Parameters

##### `backspace=`

backspace="3"

The `backspace=` parameter will remove characters, including spaces and line breaks, from the last iteration of the tag pair.

#### Error Tag Pair Variables

##### `{error}`

{error}

The error text.



## Example


Expand All @@ -167,4 +132,4 @@ The error text.
<p><input type="submit" name="submit" value="Submit" /></p>

<p><a href="{path='member/forgot-password'}">Forgot password?</a> &nbsp; &nbsp; <a href="{path='member/forgot-username'}">Forgot username?</a></p>
{/exp:member:login_form}
{/exp:member:login_form}
43 changes: 5 additions & 38 deletions docs/member/registration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ Output a member registration form.

## Parameters

### `error_handling=`

error_handling="inline"

Choose to display error messages inline (see [Error Messages](#errors)). By default, errors are displayed with the user message template.

### `return=`

return="member/registration/success"
Expand Down Expand Up @@ -73,11 +67,13 @@ Member username. This is a **required** field and must be unique across the site
<label for="username">Username</label>
<input type="text" name="username" value="" maxlength="120" size="40" />

<!--
### Custom Member Fields

Member username. This is a **required** field and must be unique across the site:
-->
Custom member fields that have "Show in registration?" setting turned on can be used in member registration form.
Please note you need to address those by ID and not name, e.g. `m_field_id_8`

<label for="work_title">Work title</label>
<input type="text" id="work_title" name="m_field_id_1" size="40" />

## Variables

Expand Down Expand Up @@ -105,33 +101,6 @@ Member username. This is a **required** field and must be unique across the site

{if username}{username}{/if}

## Variable Pairs

### `{errors}`

Form submission errors are displayed using a "looping pair" as there can be more than 1 error in a form submission.

{errors}
<p>{error}</p>
{/errors}

#### Error Tag Pair Parameters

##### `backspace=`

backspace="3"

The `backspace=` parameter will remove characters, including spaces and line breaks, from the last iteration of the tag pair.

#### Error Tag Pair Variables

##### `{error}`

{error}

The error text.



## Example

Expand Down Expand Up @@ -199,5 +168,3 @@ The error text.

<input type="submit" value="Register" class="btn btn-primary" />
{/exp:member:registration_form}


24 changes: 18 additions & 6 deletions docs/templates/conditionals.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,17 +312,29 @@ There are a handful of variables that are always available to conditionals.

You can test against the email address of the currently logged in user.

### `logged_in_group_description`
### `logged_in_primary_role_id`

{if logged_in_group_description *= 'games'} Shall we play a game? {/if}
{if logged_in_role_id == '7'} You're an "Editor"! {/if}

You can test against the group description of the currently logged in user.
You can test against the Primary Role of the currently logged in user.

### `logged_in_role_id`
### `logged_in_primary_role_name`

{if logged_in_role_id == '7'} You're an "Editor"! {/if}
{if logged_in_primary_role_name *= 'games'} Shall we play a game? {/if}

You can test against the Primary Role of the currently logged in user.
You can test against the primary role name of the currently logged in user.

### `logged_in_primary_role_description`

{if logged_in_primary_role_description *= 'games'} Shall we play a game? {/if}

You can test against the primary role description of the currently logged in user.

### `has_role_*X*`

{if has_role_editor} Logged in with editor permissions {/if}

With `X` being short role name, you can use this conditional to check whether logged in user has certain role. This takes into account all the 'secondary' roles assigned.

### `logged_in_ip_address`

Expand Down
12 changes: 6 additions & 6 deletions docs/templates/globals/single-variables.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,18 +259,18 @@ The email address for the site, as specified in [Email Configuration](control-pa

The email address for the currently logged-in user.

### `{logged_in_group_description}`

The Primary Role description for the currently logged-in user.

### `{logged_in_role_id}`
### `{logged_in_primary_role_id}`

The Primary Role ID number for the currently logged-in user.

### `{logged_in_role_title}`
### `{logged_in_primary_role_name}`

The title of the Primary Role for the currently logged-in user.

### `{logged_in_primary_role_description}`

The Primary Role description for the currently logged-in user.

### `{logged_in_ip_address}`

This variable will be substituted with the IP address of the currently logged in user.
Expand Down