[dev] [commit] r903 - templates/admin wwwbase/admin wwwbase/js

[automailer at dexonline.ro]

Author: cata
Date: Fri Jul 12 14:50:38 2013
New Revision: 903

Log:
convert the similarLexem field in lexemEdit.php to select2.

Modified:
   templates/admin/lexemEdit.ihtml
   wwwbase/admin/lexemEdit.php
   wwwbase/js/struct.js

Modified: templates/admin/lexemEdit.ihtml
==============================================================================
--- templates/admin/lexemEdit.ihtml	Fri Jul 12 12:58:11 2013	(r902)
+++ templates/admin/lexemEdit.ihtml	Fri Jul 12 14:50:38 2013	(r903)
@@ -145,12 +145,8 @@
     {/foreach}
     <br/><br/>
 
-    <b>2. {include file="common/bits/lexemName.ihtml" lexem=$lexem}</b>
-    se flexionează ca
-    <input id="similarLexem" type="text" name="similarLexemName" value="" size="40"/>
-    <script type="text/javascript">
-      $("#similarLexem").autocomplete({ldelim} source: wwwRoot + 'ajax/getLexems.php' {rdelim});
-    </script>
+    <b>2. {include file="common/bits/lexemName.ihtml" lexem=$lexem}</b> se flexionează ca
+    <input id="similarLexemId" type="text" name="similarLexemId"/>
     <br/><br/>
 
     <b>3. {include file="common/bits/lexemName.ihtml" lexem=$lexem}</b>
@@ -290,3 +286,7 @@
     </form>
   {/if}
 </div>
+
+<script>
+  $(lexemEditInit);
+</script>

Modified: wwwbase/admin/lexemEdit.php
==============================================================================
--- wwwbase/admin/lexemEdit.php	Fri Jul 12 12:58:11 2013	(r902)
+++ wwwbase/admin/lexemEdit.php	Fri Jul 12 14:50:38 2013	(r903)
@@ -18,7 +18,7 @@
 $modelType = util_getRequestParameter('modelType');
 $modelNumber = util_getRequestParameter('modelNumber');
 $similarModel = util_getRequestParameter('similarModel');
-$similarLexemName = util_getRequestParameter('similarLexemName');
+$similarLexemId = util_getRequestParameter('similarLexemId');
 $restriction = util_getRequestCheckboxArray('restr', '');
 $miniDefTarget = util_getRequestParameter('miniDefTarget');
 
@@ -77,7 +77,7 @@
   util_redirect("lexemEdit.php?lexemId={$newLexem->id}");
 }
 
-if (!$similarModel && !$similarLexemName && !$refreshLexem && !$updateLexem) {
+if (!$similarModel && !$similarLexemId && !$refreshLexem && !$updateLexem) {
   RecentLink::createOrUpdate("Lexem: {$lexem}");
 }
 
@@ -127,7 +127,7 @@
 }
 
 // The new model type, number and restrictions can come from three sources:
-// $similarModel, $similarLexemName or ($modelType, $modelNumber,
+// $similarModel, $similarLexemId or ($modelType, $modelNumber,
 // $restriction) directly
 $errorMessage = '';
 if ($similarModel !== null) {
@@ -135,18 +135,11 @@
   $lexem->modelType = $parts[0];
   $lexem->modelNumber = $parts[1];
   $lexem->restriction = $parts[2];
-} else if ($similarLexemName) {
-  $matches = Lexem::loadByExtendedName($similarLexemName);
-  if (count($matches) == 1) {
-    $similarLexem = $matches[0];
-    $lexem->modelType = $similarLexem->modelType;
-    $lexem->modelNumber = $similarLexem->modelNumber;
-    $lexem->restriction = $similarLexem->restriction;
-  } else {
-    $errorMessage = (count($matches) == 0)
-      ? "Lexemul <i>".htmlentities($similarLexemName)."</i> nu există."
-      : "Lexemul <i>".htmlentities($similarLexemName)."</i> este ambiguu.";
-  }
+} else if ($similarLexemId) {
+  $similarLexem = Lexem::get_by_id($similarLexemId);
+  $lexem->modelType = $similarLexem->modelType;
+  $lexem->modelNumber = $similarLexem->modelNumber;
+  $lexem->restriction = $similarLexem->restriction;
 } else if ($modelType !== null) {
   $lexem->modelType = $modelType;
   $lexem->modelNumber = $modelNumber;
@@ -220,8 +213,8 @@
 SmartyWrap::assign('allStatuses', util_getAllStatuses());
 SmartyWrap::assign('errorMessage', $errorMessage);
 SmartyWrap::assign('recentLinks', RecentLink::loadForUser());
-SmartyWrap::addCss('jqueryui', 'paradigm');
-SmartyWrap::addJs('jquery', 'jqueryui');
+SmartyWrap::addCss('jqueryui', 'paradigm', 'select2');
+SmartyWrap::addJs('jquery', 'jqueryui', 'struct', 'select2');
 SmartyWrap::assign('sectionTitle', "Editare lexem: {$lexem->form} {$lexem->modelType}{$lexem->modelNumber}{$lexem->restriction}");
 SmartyWrap::displayAdminPage('admin/lexemEdit.ihtml');
 

Modified: wwwbase/js/struct.js
==============================================================================
--- wwwbase/js/struct.js	Fri Jul 12 12:58:11 2013	(r902)
+++ wwwbase/js/struct.js	Fri Jul 12 14:50:38 2013	(r903)
@@ -92,6 +92,14 @@
   });
 }
 
+function lexemEditInit() {
+  $('#similarLexemId').select2({
+    ajax: struct_lexemAjax,
+    minimumInputLength: 1,
+    width: '300px',
+  });
+}
+
 function contribInit() {
   $('#lexemIds').select2({
     ajax: struct_lexemAjax,