Changeset 2094

Timestamp:

09/19/17 19:34:41 (7 years ago)

Author:

nanardon

Message:

Allow to set allowed_values insde database instead config, this work only for SQL base

Location:

trunk/LATMOS-Accounts

Files:

• Changes (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• Makefile.PL (modified) (1 diff)
• bin/la-sql-attrvalues (added)
• lib/LATMOS/Accounts/Bases/Sql.pm (modified) (2 diffs)
• lib/LATMOS/Accounts/Bases/Sql/upgrade.pm (modified) (1 diff)

trunk/LATMOS-Accounts/Changes

@@ +1 @@
+5.2.20
+    - Allow to limit attribute value from database settings
+    - Make netZone attribute for nethost searchable
+
 5.2.19
     - Allow to use a specific cracklib dictionnary 

trunk/LATMOS-Accounts/MANIFEST

@@ -28 +28 @@
 bin/la-search
 bin/la-sql-alias
+bin/la-sql-attrvalues
 bin/la-sql-crypt-passwd
 bin/la-sql-edit-form

trunk/LATMOS-Accounts/Makefile.PL

@@ -87 +87 @@
         bin/la-renewEmp
         bin/la-load-csv
+        bin/la-sql-attrvalues
         ) ],
         macro => {

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm

@@ -18 +18 @@
 our $VERSION = (q$Rev$ =~ /^Rev: (\d+) /)[0];
 
-sub SCHEMA_VERSION { 26 };
+sub SCHEMA_VERSION { 28 };
 
 =head1 NAME
@@ -796 +796 @@
 =head1 ATTRIBUTES FUNCTIONS
 
+=cut
+
+sub obj_attr_allowed_values {
+    my ($self, $otype, $attr) = @_;
+    if (my @values = $self->SUPER::obj_attr_allowed_values("$otype.$attr", 'allowed')) {
+        return @values;
+    } else {
+        $self->ListAttrValue($otype, $attr);
+    }
+}
+
+=head2 ListAttrValue($otype, $attribute)
+
+List values allow for an attribute set into SQL database
+
+=cut
+
+sub ListAttrValue {
+    my ($self, $otype, $attr) = @_;
+
+    my @sqlvalues;
+    my $getAllow = $self->db->prepare_cached(q{
+        SELECT * FROM attributes_values WHERE otype = ? AND attributes = ?
+        ORDER BY "value"
+    });
+    $getAllow->execute($otype, $attr);
+    while (my $res = $getAllow->fetchrow_hashref) {
+        push(@sqlvalues, $res->{value});
+    }
+    return @sqlvalues;
+}
+
+=head2 AddAttrValue($otype, $attr, @values)
+
+Add given values to allowed attribute list
+
+=cut
+
+sub AddAttrValue {
+    my ($self, $otype, $attr, @values) = @_;
+    
+    my $addAllow = $self->db->prepare_cached(q{
+        INSERT INTO attributes_values (otype, attributes, "value") values (?,?,?)
+    });
+    
+    foreach my $value (@values) {
+        if ($addAllow->execute($otype, $attr, $value)) {
+        } else {
+            $self->rollback;
+            return;
+        }
+    }
+
+    return 1;
+}
+
+=head2 DelAttrValue
+
+Delete a
+
+=cut
+
+sub DelAttrValue {
+    my ($self, $otype, $attr, @values) = @_;
+
+    if (@values) {
+        my $delAllow = $self->db->prepare_cached(q{
+            DELETE FROM attributes_values WHERE otype = ? and attributes = ? and "value" = ?
+        });
+
+        foreach my $value (@values) {
+
+            if ($delAllow->execute($otype, $attr, $value)) {
+            } else {
+                $self->rollback;
+                return;
+            }
+
+        }
+        return 1;
+    } else {
+        my $delAllow = $self->db->prepare_cached(q{
+            DELETE FROM attributes_values WHERE otype = ? and attributes = ?
+        });
+        if ($delAllow->execute($otype, $attr)) {
+            return 1;
+        } else {
+            $self->rollback;
+            return;
+        }
+    }
+}
+
 =head2 register_attribute ($otype, $attribute, $comment)
 

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/upgrade.pm

@@ -1137 +1137 @@
                 }
             ],
-        }
+        },
+        {
+            ver => 28,
+            sql => [
+                q{
+                CREATE TABLE attributes_values
+                (
+                -- Hérité(e) from table revisions:  rev integer NOT NULL DEFAULT nextval('revisions_rev_seq'::regclass),
+                -- Hérité(e) from table revisions:  date timestamp with time zone NOT NULL DEFAULT now(),
+                -- Hérité(e) from table revisions:  "create" timestamp with time zone NOT NULL DEFAULT now(),
+                -- Hérité(e) from table revisions:  ikey integer NOT NULL DEFAULT nextval('ikey_seq'::regclass),
+                otype text NOT NULL,
+                attributes text NOT NULL,
+                value text NOT NULL,
+                CONSTRAINT attributes_values_pkey PRIMARY KEY (ikey)
+                )
+                INHERITS (revisions)
+                );
+
+                CREATE UNIQUE INDEX attributes_values_idx
+                ON attributes_values
+                USING btree
+                (otype, attributes, value);
+                }
+            ]
+        };
     );