[dev] [commit] r939 - phplib/models templates/common/bits wwwbase

[automailer at dexonline.ro]

Author: cata
Date: Mon Aug 19 09:26:08 2013
New Revision: 939

Log:
Whoops! Fix broken references left after r927.

Modified:
   phplib/models/LexemSource.php
   templates/common/bits/lexemTags.ihtml
   wwwbase/paradigm.php
   wwwbase/search.php

Modified: phplib/models/LexemSource.php
==============================================================================
--- phplib/models/LexemSource.php	Sun Aug 18 23:09:45 2013	(r938)
+++ phplib/models/LexemSource.php	Mon Aug 19 09:26:08 2013	(r939)
@@ -9,6 +9,16 @@
     return util_objectProperty($lexemSources, 'sourceId');
   }
 
+  public static function getSourceNamesForLexem($lexem) {
+    $lexemSources = LexemSource::get_all_by_lexemId($lexem->id);
+    $results = array();
+    foreach($lexemSources as $ls) {
+      $source = Source::get_by_id($ls->sourceId);
+      $results[] = $source->shortName;
+    }
+    return implode(', ', $results);
+  }
+
   public static function deleteByLexemId($lexemId) {
     $meanings = self::get_all_by_lexemId($lexemId);
     foreach ($meanings as $m) {

Modified: templates/common/bits/lexemTags.ihtml
==============================================================================
--- templates/common/bits/lexemTags.ihtml	Sun Aug 18 23:09:45 2013	(r938)
+++ templates/common/bits/lexemTags.ihtml	Mon Aug 19 09:26:08 2013	(r939)
@@ -1,4 +1,4 @@
 {strip}
-  {if $lexem->source}<br/><spam class="lexemTags">Surse flexiune: {$sourceNames}</spam>{/if}
-  {if $lexem->tags}<br/><spam class="lexemTags">{$lexem->tags|escape}</spam>{/if}
+  {if $sourceNames}<br/><span class="lexemTags">Surse flexiune: {$sourceNames}</span>{/if}
+  {if $lexem->tags}<br/><span class="lexemTags">{$lexem->tags|escape}</span>{/if}
 {/strip}

Modified: wwwbase/paradigm.php
==============================================================================
--- wwwbase/paradigm.php	Sun Aug 18 23:09:45 2013	(r938)
+++ wwwbase/paradigm.php	Mon Aug 19 09:26:08 2013	(r939)
@@ -98,11 +98,11 @@
   }
 
   $sourceNamesArr = array();
-  foreach($lexems as $l) {
-    $sourceNamesArr[] = LexemSources::getNamesOfSources($l->source);
+  foreach ($lexems as $l) {
+    $sourceNamesArr[] = LexemSource::getSourceNamesForLexem($l);
   }
 
-  // This paragraph replicates code from paradigm.php
+  // This paragraph replicates code from search.php
   $hasUnrecommendedForms = false;
   foreach ($ifMaps as $ifMap) {
     foreach ($ifMap as $rank => $ifs) {

Modified: wwwbase/search.php
==============================================================================
--- wwwbase/search.php	Sun Aug 18 23:09:45 2013	(r938)
+++ wwwbase/search.php	Mon Aug 19 09:26:08 2013	(r939)
@@ -224,8 +224,8 @@
     SmartyWrap::assign('declensionText', $declensionText);
 
     $sourceNamesArr = array();
-    foreach($lexems as $l) {
-      $sourceNamesArr[] = LexemSources::getNamesOfSources($l->source);
+    foreach ($lexems as $l) {
+      $sourceNamesArr[] = LexemSource::getSourceNamesForLexem($l);
     }
 
     SmartyWrap::assign('sourceNamesArr', $sourceNamesArr);