-Permissions bug fixes

Alexey Boroda
1 parent 287e356d
Showing 1 changed file with 13 additions and 7 deletions Show diff stats
views/order/_form.php
@@ -172,11 +172,16 @@ JS;
         <div class="row">
           <div class="col-sm-6">
-              <?= $form->field($model, 'deadline')
+              <?php
+                  $model->deadline = date('d.m.Y', (int) $model->deadline);
+                  echo $form->field($model, 'deadline')
                        ->widget(
                            DatePicker::className(),
                            [
                                'disabled' => !$permissions->checkAttr('deadline'),
+                               'pluginOptions' => [
+                                 'format' => 'dd.mm.yyyy',
+                               ],
                            ]
                        ) ?>
@@ -208,7 +213,9 @@ JS;
               <?= $form->field($model, 'label')
                        ->dropDownList(
                            ArrayHelper::map(
-                               Label::find()
+                               Label::find()->where([
+                                 'id' => $permissions->labelsArray,
+                                                    ])
                                     ->asArray()
                                     ->all(),
                                'id',
@@ -263,7 +270,7 @@ JS;
               <?php
-                  if (!$permissions->checkAttr('manager_id')) {
+                  if ($permissions->checkAttr('manager_id')) {
                       echo $form->field($model, 'manager_id')
                                 ->dropDownList(
                                     ArrayHelper::map(
@@ -730,12 +737,11 @@ JS;
                                       ); ?>
         </div>
         <div class="col-md-2" style="margin-top: 23px">
-            <?php echo Html::submitButton(
+            <?php if ($permissions->checkAttr('add_product'))
+              echo Html::submitButton(
                 \Yii::t('app', 'Добавить'),
                 [
-                    'class' => ( $model->isNewRecord || !$permissions->checkAttr(
-                            'add_product'
-                        ) ) ? 'btn btn-primary disabled' : 'btn btn-primary',
+                    'class' => 'btn btn-primary',
                 ]
             ) ?>
         </div>