[dev] [commit] r1053 - templates/admin wwwbase/admin

automailer at dexonline.ro automailer at dexonline.ro
Mon Jan 13 04:18:05 EET 2014


Author: radu
Date: Mon Jan 13 04:18:05 2014
New Revision: 1053

Log:
fix similar source checkbox and change the flow a little bit

Modified:
   templates/admin/definitionEdit.ihtml
   wwwbase/admin/definitionEdit.php

Modified: templates/admin/definitionEdit.ihtml
==============================================================================
--- templates/admin/definitionEdit.ihtml	Sat Jan 11 02:43:11 2014	(r1052)
+++ templates/admin/definitionEdit.ihtml	Mon Jan 13 04:18:05 2014	(r1053)
@@ -1,4 +1,4 @@
-<form action="definitionEdit.php" method="post" name="frmDef">
+<form action="definitionEdit.php{if $definitionId}?definitionId={$definitionId}{/if}" method="post" name="frmDef">
   <input type="hidden" name="definitionId" value="{$def->id}"/>
   {if $isOCR}
   <input type="hidden" name="ocr" value="1"/>
@@ -92,10 +92,10 @@
         {/if}
       </td>
     </tr>
-    <tr id='similarSourceRow' {if $similarSource->shortName}{else}style="display:none"{/if}>
+    <tr id='similarSourceRow' {if $simSource->shortName}{else}style="display:none"{/if}>
       <td>Similarități</td>
       <td>
-        <input type="checkbox" id="similarSource" name="similarSource" value="1" {if $def->similarSource}checked="checked"{/if}/> Definiție identică cu cea din {$similarSource->shortName}
+        <input type="checkbox" id="similarSource" name="similarSource" value="1" {if $def->similarSource}checked="checked"{/if}/> Definiție identică cu cea din {$simSource->shortName}
       </td>
     </tr>
     <tr>
@@ -145,10 +145,10 @@
   Comentariu: {$comment->htmlContents}
 {/if}
 
-{if $similarSource->shortName}
-<input type="hidden" id="similarSourceId" value="{$similarSource->id}"/>
+{if $simSource->shortName}
+<input type="hidden" id="similarSourceId" value="{$simSource->id}"/>
 <div style="display:hidden">
-  <font color="red">Definiția din {$similarSource->shortName} corespunzătoare lexemului:</font>
+  <font color="red">Definiția din {$simSource->shortName} corespunzătoare lexemului:</font>
 </div>
 <div id="similarPreview">
 {$similarDef->htmlRep|default:'<font color="#888">Nu există nicio definiție similară sau nu e niciun lexem definit</font>'}

Modified: wwwbase/admin/definitionEdit.php
==============================================================================
--- wwwbase/admin/definitionEdit.php	Sat Jan 11 02:43:11 2014	(r1052)
+++ wwwbase/admin/definitionEdit.php	Mon Jan 13 04:18:05 2014	(r1053)
@@ -3,10 +3,10 @@
 util_assertModerator(PRIV_EDIT);
 util_assertNotMirror();
 
-$isOCR = util_getRequestIntParameter('ocr');
+$isOCR = null;
 $nextOcrBut = util_getRequestParameter('but_next_ocr');
 $definitionId = util_getRequestIntParameter('definitionId');
-if($definitionId && !$nextOcrBut) {
+if($definitionId) {
     $lexemIds = util_getRequestCsv('lexemIds');
     $sourceId = util_getRequestIntParameter('source');
     $similarSource = util_getRequestParameter('similarSource');
@@ -94,11 +94,15 @@
 if ($sourceId) {
   $definition->sourceId = (int)$sourceId;
 }
-if ($similarSource) {
-  $definition->similarSource = 1;
-}
-else {
-  $definition->similarSource = 0;
+
+//ugly workaround - TBD a better solution
+if ($_POST) {
+  if ($similarSource) {
+    $definition->similarSource = 1;
+  }
+  else {
+    $definition->similarSource = 0;
+  }
 }
 
 if ($internalRep || $sourceId) {
@@ -172,6 +176,7 @@
       }
     }
   } else {
+    $ldms = LexemDefinitionMap::get_all_by_definitionId($definitionId);
     db_execute("delete from LexemDefinitionMap where definitionId = {$definitionId}");
     foreach ($ldms as $ldm) {
       $ldm->save();
@@ -185,7 +190,7 @@
   //TODO: check if definition has lexems
   $definition->save();
   log_userLog("Edited OCR definition {$definition->id} ({$definition->lexicon}), ocr ({$ocr->id})");
-  //util_redirect('definitionEdit.php?definitionId=' . $definitionId . "&ocr=1");
+  util_redirect('definitionEdit.php');
 }
 
 $source = Source::get_by_id($definition->sourceId);
@@ -208,9 +213,12 @@
 }
 
 SmartyWrap::assign('isOCR', $isOCR);
+if ($definitionId) {
+  SmartyWrap::assign('definitionId', $definitionId);
+}
 SmartyWrap::assign('def', $definition);
 SmartyWrap::assign('source', $source);
-SmartyWrap::assign('similarSource', $similarSourceObj);
+SmartyWrap::assign('simSource', $similarSourceObj);
 SmartyWrap::assign('similarDef', $similarDefObj);
 SmartyWrap::assign('user', User::get_by_id($definition->userId));
 SmartyWrap::assign('comment', $comment);


More information about the Dev mailing list