Merge remote-tracking branch 'origin/master'

Yarik
2 parents 3533e4e9 9e523ea9
Showing 6 changed files with 140 additions and 3 deletions Show diff stats
frontend/controllers/CabinetController.php
frontend/views/cabinet/_update_form.php
frontend/views/cabinet/index.php
frontend/views/cabinet/sales.php
frontend/web/css/cabinet-style.css
frontend/web/js/script.js
@@ -308,6 +308,40 @@
                 ];
             }
         }
+    
+        public function actionUpdateRole()
+        {
+            $request = \Yii::$app->request;
+            $response = \Yii::$app->response;
+            $response->format = $response::FORMAT_JSON;
+        
+            $role = CreativeRole::findOne($request->get('id'));
+    
+            if ($role->load($request->post()) && $role->save()) {
+                return [
+                    'success' => true,
+                    'message' => 'Данные успешно сохранены',
+                ];
+            } else {
+                return [
+                    'error'   => true,
+                    'message' => 'Ошибка сохранения данных',
+                ];
+            }
+        }
+    
+        public function actionGetRoleForm()
+        {
+            $request = \Yii::$app->request;
+            $response = \Yii::$app->response;
+            $response->format = $response::FORMAT_JSON;
+        
+            $model = CreativeRole::findOne($request->post('id'));
+            
+            return [
+                'answer' => $this->renderPartial('_update_form', ['model' => $model])
+            ];
+        }
  
         public function actionDeleteRole()
         {
+<?php
+    /**
+     * @var CreativeRole $model
+     */
+    use frontend\models\CreativeRole;
+    use yii\helpers\Html;
+    use yii\widgets\ActiveForm;
+?>
+
+<div class="modal-dialog" role="document">
+<div class="modal-content">
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title" id="myModalLabel">Редагувати роль</h4>
+    </div>
+    <?php
+        $form = ActiveForm::begin(
+            [
+                'action' => 'update-role?id=' . $model->id,
+                'id'     => 'update-role-form',
+            ]
+        );
+
+    ?>
+    <div class="modal-body forms-cabinet forms-2">
+        
+        
+        
+        <?php
+            echo $form->field($model, 'title');
+        ?>
+        
+        <?php
+            echo $form->field($model, 'name');
+        ?>
+        
+        <?php
+            echo $form->field($model, 'part');
+        ?>
+        
+        <?php
+            echo $form->field($model, 'code');
+        ?>
+        
+        <?php
+            echo $form->field($model, 'iri');
+        ?>
+        
+        <?php
+            echo $form->field($model, 'society');
+            echo $form->field($model, 'id')->hiddenInput()->label(false);
+        ?>
+    
+    </div>
+  <div class="clearfix"></div>
+    <div class="modal-footer btn-submit-blue">
+        <?php
+            echo Html::submitButton(
+                'OK'
+            );
+        ?>
+    </div>
+    <?php
+        $form::end();
+    ?>
+</div>
+</div>
@@ -68,7 +68,7 @@
                       ?>
                 <tr>
                   <td><?= $i; ?></td>
-                  <td><?= $row->title ?></td>
+                  <td><?php echo Html::a($row->title, ['sales', 'id' => $row->id])?></td>
                   <td><?= $row->registration_date ?></td>
                   <td><?= $row->genre ?></td>
                   <td><?= $row->author_role ?></td>
@@ -179,7 +179,7 @@
                           <td><?= $row->code ?></td>
                           <td><?= $row->iri ?></td>
                           <td><?= $row->society ?></td>
-                          <td><a href="#" class="edit-table"></a><a href="#" class="remove-table delete-role" data-id="<?=$row->id?>"></a>
+                          <td><a href="#" class="edit-table update-role" data-id="<?=$row->id?>"></a><a href="#" class="remove-table delete-role" data-id="<?=$row->id?>"></a>
                           </td>
                         </tr>
                           <?php
@@ -270,4 +270,10 @@
         ?>
     </div>
   </div>
+</div>
+
+
+<!-- Modal Update -->
+<div class="modal fade" id="update-role-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    
 </div>
 \ No newline at end of file
@@ -748,7 +748,9 @@ ul.list-cab li.active-li ul li.active-li-drop span.act_bg {
  
  
 /* Add modal */
-#add-composition-modal .forms-cabinet, #add-role-modal .forms-cabinet {
+#add-composition-modal .forms-cabinet,
+#add-role-modal .forms-cabinet,
+#update-role-modal .forms-cabinet {
     width: 100%;
     margin: 0;
     max-width: 1000px;
@@ -312,6 +312,23 @@ $(document).ready(function(){
         return false;
     });
  
+    $(document).on('submit', '#update-role-form', function() {
+        $.post($(this).attr('action'), $(this).serialize(), function(data) {
+            var type;
+            if(data.error) {
+                type = 'danger';
+            } else {
+                type = 'success';
+            }
+            $('#update-role-modal').modal('hide');
+            showStatus(data.message, type);
+            $.pjax.reload('#roles-table');
+            $('#update-role-modal').html('');
+        });
+
+        return false;
+    });
+
     $(document).on('click', '.delete-role', function(e) {
         e.preventDefault();
         confirm('Удалить роль?');
@@ -329,6 +346,16 @@ $(document).ready(function(){
         });
     });
  
+    $(document).on('click', '.update-role', function(e) {
+        e.preventDefault();
+        $.post('get-role-form', {
+            id:$(this).attr('data-id')
+        }, function(data) {
+            $('#update-role-modal').html(data.answer);
+            $('#update-role-modal').modal('show');
+        });
+    });
+
     $(document).on('click', '.remove-int-prop', function(e) {
         e.preventDefault();
         confirm('Удалить элемент?');