7.20.0

trickyplan · Sep 5, 2013 · f139cf4 · f139cf4
1 parent 254a828
commit f139cf4
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "keywords": ["framework", "oop sucks", "fp rules"],
     "homepage": "http://one2team.ru/project/Codeine",
     "license": "BSD-2-Clause",
-    "version": "7.10.3",
+    "version": "7.20.0",
     "authors": [
         {
             "name": "Dmitry Bergstein",
@@ -31,7 +31,7 @@
             "type": "package",
             "package": {
                 "name": "one2team/codeine",
-                "version": "7.10.3",
+                "version": "7.20.0",
                 "dist": {
                     "url": "http://deb.one2team.ru/",
                     "type": "deb"

diff --git a/src/Drivers/Entity.php b/src/Drivers/Entity.php
@@ -24,7 +24,9 @@
         else
             F::Log('Model for '.$Call['Entity'].' not found', LOG_CRIT);
 
-       $Call = F::Hook('afterEntityLoad', $Call);
+        $Call = F::Hook('afterEntityLoad', $Call);
+
+        $Call['entity'] = strtolower($Call['Entity']);
 
         return $Call;
     });

diff --git a/src/Drivers/Entity/Form.php b/src/Drivers/Entity/Form.php
@@ -49,6 +49,11 @@
                     if($IC == 0)
                         $Widget['Autofocus'] = true;
 
+                    if (isset($Widget['Options']))
+                        $Widget['Options'] = F::Live($Widget['Options']);
+                    else
+                        $Widget['Options'] = [];
+
                     if (isset($Node['Localized']) && $Node['Localized'])
                         $Widget['Label']  = $Call['Entity'].'.Entity:'.$Name.'.Label';
                     else
@@ -69,11 +74,6 @@
                     if (isset($Call['Data']))
                         $Widget['Data'] = $Call['Data'];
 
-                    if (isset($Widget['Options']))
-                        $Widget['Options'] = F::Live($Widget['Options']);
-                    else
-                        $Widget['Options'] = [];
-
                     // Если есть значение, добавляем
                     if (($Widget['Value'] = F::Dot($Call['Data'], $Name)) === null)
                     {

diff --git a/src/Drivers/View/HTML/Widget/Form/Radiogroup.php b/src/Drivers/View/HTML/Widget/Form/Radiogroup.php
@@ -10,19 +10,27 @@
     setFn('Make', function ($Call)
     {
         $Call['Radios'] = '';
+
         foreach($Call['Options'] as $IX => $Value)
+        {
+            if (isset($Call['Localized']) && $Call['Localized'])
+                $lValue = '<l>'.$Call['Entity'].'.Entity:'.$Call['Key'].'.'.$Value.'</l>';
+            else
+                $lValue = $Value;
+
             $Call['Radios'] .= F::Run('View', 'Load',
-                    [
-                        'Scope' => $Call['Widget Set'].'/Widgets',
-                        'ID' => 'Form/Radio',
-                        'Data' =>
-                            F::Merge ($Call,
-                                [
-                                    'Value' => $Value,
-                                    'Checked' => ($IX == $Call['Value']? 'checked': '')
-                                ])
-                    ]
-                    );
+                [
+                    'Scope' => $Call['Widget Set'].'/Widgets',
+                    'ID' => 'Form/Radio',
+                    'Data' =>
+                    F::Merge ($Call,
+                        [
+                            'Value' => $lValue,
+                            'Checked' => ($IX == $Call['Value']? 'checked': '')
+                        ])
+                ]
+            );
+        }
 
         return $Call;
      });
diff --git a/src/Drivers/View/HTML/Widget/Form/Select.php b/src/Drivers/View/HTML/Widget/Form/Select.php
@@ -29,9 +29,9 @@
                     $Value = $Option;
 
                  if (isset($Call['Localized']) && $Call['Localized'])
-                     $lValue = '<l>'.$Call['Entity'].'.Entity:'.$Call['Node'].'.'.$Value.'</l>';
+                    $lValue = '<l>'.$Call['Entity'].'.Entity:'.$Call['Key'].'.'.$Value.'</l>';
                  else
-                     $lValue = $Value;
+                    $lValue = '<l>'.$Call['Entity'].'.Entity:'.$Call['Key'].'.'.$Value.'</l>';
 
                  if ($Key == $Call['Value'] || $Value == $Call['Value'] || (is_array($Call['Value']) && in_array($Key, $Call['Value'])))
                      $Options[] = '<option value="'.$Key.'" selected>'.$lValue.'</option>';

diff --git a/src/Options/Mixins/CRUD.json b/src/Options/Mixins/CRUD.json
@@ -17,7 +17,7 @@
                 "Method": "Redirect",
                 "Call":
                 {
-                    "Location": "/user/$Data.ID"
+                    "Location": "/$entity/$Data.ID"
                 }
             }
         },

diff --git a/src/Options/User/Entity.json b/src/Options/User/Entity.json
@@ -39,7 +39,7 @@
             "Type": "List.Enum",
             "Default": 0,
             "Options": ["M", "F"],
-            "Localizable": true,
+            "Localized": true,
             "Widgets":
             {
                 "Write":
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ @@
                     "Method": "Redirect",
                     "Call":
                     {
-                        "Location": "/user/$Data.ID"
+                        "Location": "/$entity/$Data.ID"
                     }
                 }
             },
@@ Expand Down @@