Changeset 11478 for trunk

Timestamp:

10/06/08 17:23:40 (3 months ago)

Author:

juruen@…

Message:

get ready for 0.1.1

Location:

trunk/extra/moddev

Files:

• configure.ac (modified) (1 diff)
• src/ebox-moddev-model.in (modified) (5 diffs)
• stubs/src/Model/FormModel.pm.mas (modified) (3 diffs)

trunk/extra/moddev/configure.ac

@@ -1 @@
-AC_INIT([emoddev], [0.1])
+AC_INIT([emoddev], [0.1.1])
 
 AC_CONFIG_AUX_DIR([config])

trunk/extra/moddev/src/ebox-moddev-model.in

@@ -19 +19 @@
 sub types
 {
-    return qw/Text Int Boolean Port HostIP IPAddress/;
+    return qw/Text Int Boolean Port HostIP IPAddress Select/;
 }
 
@@ -166 +166 @@
               modelDomain => $options->{mainClass},
               fields    => $options->{parsedFields},
+              modelType => $options->{model}
               ));
     write_file("$dir/$mainClass", ${$output});
@@ -182 +183 @@
     for my $model (@{_models($dir)}) {
         $code .= ' ' x 8;
+        $model =~ s/\.pm//;
         $code .= "'EBox::${mainClass}::Model::$model',\n";
     }
@@ -209 +211 @@
 }
 
+sub _runAutogen
+{
+    if (-e 'autogen.sh') {
+        system('./autogen.sh');
+    } else {
+        print STDERR " You will have to manually run autogen.sh within your module directory";
+    }
+}
+
 sub _createModel
 {
@@ -223 +234 @@
    _makefile($interp, \$output, $options);
    _addModelsToMainClass($interp, \$output, $options);
-
+   _runAutogen();
 }
 

trunk/extra/moddev/stubs/src/Model/FormModel.pm.mas

@@ -54 +54 @@
 }
 
+% for my $field (@fields) {
+%   if ($field->{type} eq 'Select') {
+# Method: populate_<% $field->{name} %>
+#
+#   Callback function to fill out the values that can
+#   be picked from the <EBox::Types::Select> field <% $field->{name} %>
+#
+# Returns:
+#   
+#   Array ref of hash refs containing:
+#    
+#
+sub populate_<% $field->{name} %>
+{
+    return [ { value => 'value1', printableValue => 'value2'}];
+}
+%   }
+% }
+
 sub _table
 {
@@ -60 +79 @@
     ( 
 % for my $field (@fields) {
+%   if ($field->{type} eq 'Select') {
+        new EBox::Types::<% $field->{type} %>(
+            'fieldName' => '<% $field->{name} %>',
+            'printableName' => __('<% $field->{name} %>'),
+            'populate' => \&populate_<% $field->{name} %>,
+            'unique' => 1,
+            'editable' => 1
+        ),
+%   }   else {
         new EBox::Types::<% $field->{type} %>(
             'fieldName' => '<% $field->{name} %>',
@@ -67 +95 @@
             'editable' => 1
         ),
+%   }
 % }
     );