grahamc/hydra - Change D44B24QC6NCED6DVUYP2IJJEVBG2JNBKPBRRSLI5UXQTKA23DJQQC

Store the account type ("hydra" or "persona") explicitly in the database

Created by Eelco Dolstra on November 5, 2013

D44B24QC6NCED6DVUYP2IJJEVBG2JNBKPBRRSLI5UXQTKA23DJQQC

Dependencies

In channels

upstream

main

Change contents

Insertion in src/lib/Hydra/Controller/User.pm at line 94 [6.252]
[5.953]
[5.953]
```
            , type => "persona"
```
Insertion in src/lib/Hydra/Controller/User.pm at line 167 [6.252]
[6.3014]
[6.3014]
```
            , type => "hydra"
```

Replacement in src/lib/Hydra/Controller/User.pm at line 250 [6.252]

B:BD[7.25913] → [8.121:207]

        error($c, "This user's password cannot be reset.") if $user->password eq "!";

[7.25913]

[9.2427]

        error($c, "This user's password cannot be reset.") if $user->type ne "hydra";

Replacement in src/lib/Hydra/Controller/User.pm at line 279 [6.252]

B:BD[7.26111] → [8.208:265]

        if ($user->password ne "!" && $password ne "") {

[7.26111]

[9.3455]

        if ($user->type eq "hydra" && $password ne "") {

Insertion in src/lib/Hydra/Schema/Users.pm at line 62 [11.3258]
[10.5700]
[10.5700]
```
  is_nullable: 0
=head2 type
  data_type: 'text'
  default_value: 'hydra'
```

Insertion in src/lib/Hydra/Schema/Users.pm at line 83 [11.3258]

[12.29898]

[10.6337]

  "type",
  { data_type => "text", default_value => "hydra", is_nullable => 0 },

Replacement in src/lib/Hydra/Schema/Users.pm at line 187 [11.3258]

B:BD[13.8787] → [14.5356:5498]

# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-10-14 15:46:29
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Hv9Ukqud0d3uIUot0ErKeg

[13.8787]

[3.1838]

# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-11-05 10:22:03
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Gd8KwFcnVShZ/WihvwfgQw

Replacement in src/root/layout.tt at line 99 [17.11219]

B:BD[15.9312] → [16.83:159]

          You are signed in as <tt>[% HTML.escape(c.user.username) %]</tt>.

[15.9312]

[15.9375]

          You are signed in as <tt>[% HTML.escape(c.user.username) %]</tt>[% IF c.user.type == 'persona' %] via Persona[% END %].

Replacement in src/root/layout.tt at line 116 [17.11219]

B:BD[18.7486] → [19.472:525]

    [% IF c.user_exists && c.user.password != '!' %]

[18.7486]

[19.525]

    [% IF c.user_exists && c.user.type == 'hydra' %]

Replacement in src/root/topbar.tt at line 131 [20.6671]

B:BD[2.339] → [2.339:418]

        <a href="[% c.uri_for('/login') %]">Sign in with a Hydra user name</a>

[2.339]

[2.418]

        <a href="[% c.uri_for('/login') %]">Sign in with a Hydra account</a>

Replacement in src/root/user.tt at line 37 [21.4561]

B:BD[6.5437] → [8.340:385]

    [% IF !create && user.password != '!' %]

[6.5437]

    [% IF !create && user.type == 'hydra' %]

Replacement in src/root/user.tt at line 104 [21.4561]

B:BD[6.7453] → [4.133:211]

      [% IF !create && c.check_user_roles('admin') && user.password != '!' %]

[6.7453]

[9.5647]

      [% IF !create && c.check_user_roles('admin') && user.type == 'hydra' %]

Replacement in src/sql/hydra.sql at line 12 [23.1]

B:BD[22.1571] → [22.1571:1616]

    emailOnError  integer not null default 0

[22.1571]

[24.4131]

    emailOnError  integer not null default 0,
    type          text not null default 'hydra' -- either "hydra" or "persona"

File addition: upgrade-25.sql (----------)

[25.3004]

alter table Users add column type text not null default 'hydra';