OSDN Git Service
(root)
/
invent
/
invent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Исправлен список всех перемещений. Добавлен тест проверки возможности открытия этого...
[invent/invent.git]
/
controllers
/
ItemsController.php
diff --git
a/controllers/ItemsController.php
b/controllers/ItemsController.php
index
dd0dbb7
..
9938bcf
100644
(file)
--- a/
controllers/ItemsController.php
+++ b/
controllers/ItemsController.php
@@
-332,7
+332,7
@@
class ItemsController extends Controller
}
else
{
}
else
{
- $state = isset($row[ 'status' ]) ? StatusController::addIfNeed($row) : StatusController::addIfNeed([ '
name
' => 'Склад' ]);
+ $state = isset($row[ 'status' ]) ? StatusController::addIfNeed($row) : StatusController::addIfNeed([ '
status
' => 'Склад' ]);
if ( $state[ 'id' ] === FALSE )
{
// Сообщим об ошибке
if ( $state[ 'id' ] === FALSE )
{
// Сообщим об ошибке
@@
-487,12
+487,12
@@
class ItemsController extends Controller
$flag = FALSE;
foreach ($cellIterator as $key => $item)
{
$flag = FALSE;
foreach ($cellIterator as $key => $item)
{
- if (($key == 'A') && (stripos($item->getValue(), $columnsNames[ 'npp' ]) !== FALSE)) $flag = TRUE;
+ if (($key == 'A') && (stripos($item->get
Calculated
Value(), $columnsNames[ 'npp' ]) !== FALSE)) $flag = TRUE;
if ($flag)
{
foreach ($columnsNames as $name => $text)
{
if ($flag)
{
foreach ($columnsNames as $name => $text)
{
- if (stripos($item->getValue(), $text) !== FALSE)
+ if (stripos($item->get
Calculated
Value(), $text) !== FALSE)
{
$columns[ $name ] = $key;
}
{
$columns[ $name ] = $key;
}
@@
-508,14
+508,14
@@
class ItemsController extends Controller
{
if ($key == $columns[ 'npp' ])
{
{
if ($key == $columns[ 'npp' ])
{
- $npp = str_replace(' ', '', $item->getValue());
+ $npp = str_replace(' ', '', $item->get
Calculated
Value());
if (ctype_digit($npp)) $flag = TRUE;
}
if ($flag)
{
foreach($columns as $keym => $index)
{
if (ctype_digit($npp)) $flag = TRUE;
}
if ($flag)
{
foreach($columns as $keym => $index)
{
- if ($index == $key) $line[ $keym ] = $item->getValue();
+ if ($index == $key) $line[ $keym ] = $item->get
Calculated
Value();
}
}
}
}
}
}