[dev] [commit] r974 - templates/flex wwwbase/flex

[automailer at dexonline.ro]

Author: cata
Date: Wed Sep  4 12:03:39 2013
New Revision: 974

Log:
Fix paradigm display on the bulk label page.

Modified:
   templates/flex/bulkLabel.ihtml
   wwwbase/flex/bulkLabel.php

Modified: templates/flex/bulkLabel.ihtml
==============================================================================
--- templates/flex/bulkLabel.ihtml	Mon Sep  2 11:58:58 2013	(r973)
+++ templates/flex/bulkLabel.ihtml	Wed Sep  4 12:03:39 2013	(r974)
@@ -102,9 +102,10 @@
           {assign var="ifMapArray" value="`$ifMapMatrix[$lIter]`"}
           {foreach from=$ifMapArray item=ifMap key=pIter}
             {assign var="m" value="`$models[$pIter]`"}
+            {assign var="mt" value="`$modelTypes[$pIter]`"}
             <div class="blParadigm" style="display: none" id="paradigm_{$l->id}_{$m->modelType}_{$m->number}">
               {include file="common/paradigm/current/paradigm.ihtml"
-                       modelType=$m->modelType
+                       modelType=$mt
                        lexem=$l
                        ifMap=$ifMap}
             </div>

Modified: wwwbase/flex/bulkLabel.php
==============================================================================
--- wwwbase/flex/bulkLabel.php	Mon Sep  2 11:58:58 2013	(r973)
+++ wwwbase/flex/bulkLabel.php	Wed Sep  4 12:03:39 2013	(r974)
@@ -71,6 +71,11 @@
   $models[] = Model::factory('FlexModel')->where('modelType', 'I')->where('number', '1')->find_one();
 }
 
+$modelTypes = array();
+foreach ($models as $m) {
+  $modelTypes[] = ModelType::get_by_code($m->modelType);
+}
+
 $lexems = Model::factory('Lexem')->where('modelType', 'T')->where_like('reverse', "{$reverseSuffix}%")->order_by_asc('formNoAccent')
   ->limit(20)->find_many();
 
@@ -105,6 +110,7 @@
 SmartyWrap::assign('suffix', $suffix);
 SmartyWrap::assign('lexems', $lexems);
 SmartyWrap::assign('models', $models);
+SmartyWrap::assign('modelTypes', $modelTypes);
 SmartyWrap::assign('searchResults', $searchResults);
 SmartyWrap::assign('ifMapMatrix', $ifMapMatrix);
 SmartyWrap::assign('allStatuses', util_getAllStatuses());