mirror of
https://git.imnavajas.es/jjimenez/safekat.git
synced 2025-07-25 22:52:08 +00:00
terminando la consulta get resource del modelo maquinaspapelimpresion
This commit is contained in:
@ -235,10 +235,6 @@ if ($this->request->getPost('predeterminado') == null ) {
|
||||
->validator( 'Validate::notEmpty',array(
|
||||
'message' => lang('MaquinasTarifasImpresions.validation.tipo.required') )
|
||||
),
|
||||
Field::inst( 'predeterminado' )
|
||||
->validator( 'Validate::notEmpty',array(
|
||||
'message' => lang('MaquinasTarifasImpresions.validation.tipo.required') )
|
||||
),
|
||||
Field::inst( 'maquina_id' ),
|
||||
Field::inst( 'user_created_id' ),
|
||||
Field::inst( 'created_at' ),
|
||||
@ -254,6 +250,10 @@ if ($this->request->getPost('predeterminado') == null ) {
|
||||
// Si no se quiere borrar...
|
||||
if($data['data'][$pkey]['is_deleted'] != 1)
|
||||
{
|
||||
// Cubierta y sobrecubierta sólo pueden ser en color
|
||||
if($values['uso'] != 'interior' && $values['tipo'] != 'color'){
|
||||
return lang('MaquinasTarifasImpresions.validation.cubierta_sobrecubierta_color');
|
||||
}
|
||||
|
||||
$builder = $this->model->select('*')
|
||||
->where(array(
|
||||
@ -338,7 +338,7 @@ if ($this->request->getPost('predeterminado') == null ) {
|
||||
return $this->respond(Collection::datatable(
|
||||
$resourceData,
|
||||
$this->model->getResource()->countAllResults(),
|
||||
$this->model->getResource($search)->countAllResults()
|
||||
$this->model->getResource($search, $id_M)->countAllResults()
|
||||
));
|
||||
} else {
|
||||
return $this->failUnauthorized('Invalid request', 403);
|
||||
|
||||
Reference in New Issue
Block a user