Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
A
addcpm-json
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Александр Чаплыгин
addcpm-json
Commits
f07b6c9c
Commit
f07b6c9c
authored
Mar 28, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Добавил подключение Entity для CategoryFee
parent
f4b8016d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
Cabinet.php
src/src/App/Action/User/Cabinet.php
+5
-1
cabinet-cats.phtml
src/templates/app/user/cabinet-cats.phtml
+1
-5
No files found.
src/src/App/Action/User/Cabinet.php
View file @
f07b6c9c
...
...
@@ -32,6 +32,8 @@ use App\Model\Users;
use
App\Model\Statistics
;
use
App\Model\Providers
;
use
App\Model\Feeds\Feeds
;
use
App\Model\Feeds\CategoryFees
;
use
App\Entity\Feeds\CategoryFee
;
use
Psr\Http\Message\ResponseInterface
;
use
Psr\Http\Message\ServerRequestInterface
;
use
Zend\Diactoros\Response\HtmlResponse
;
...
...
@@ -82,7 +84,6 @@ class Cabinet extends Common
}
return
$response
;
//} else {
}
elseif
(
$request
->
getAttribute
(
'action'
)
==
self
::
ACTION_STAT
)
{
...
...
@@ -381,6 +382,7 @@ class Cabinet extends Common
/** @var DelegatingHydrator $hydrator */
$hydrator
=
$this
->
container
->
get
(
DelegatingHydrator
::
class
);
foreach
(
$cats_id
as
$cat
)
{
$category_fee
=
$categoryFeesModel
->
findOne
([
'CatID'
=>
$cat
]);
...
...
@@ -395,7 +397,9 @@ class Cabinet extends Common
throw
new
\Exception
(
'DB error'
);
}
}
else
{
$cat_item
=
$cats
[
$cat
];
$data
=
array
(
'feedid'
=>
$cat_item
[
'fi'
],
'catid'
=>
$cat_item
[
'id'
],
...
...
src/templates/app/user/cabinet-cats.phtml
View file @
f07b6c9c
...
...
@@ -56,7 +56,7 @@ if (!$error) {
<?php
else
:
?>
<section
class=
"b-content__work"
>
<div
class=
"wrapp"
style=
"position: relative;"
>
<div
class=
"wrapp"
style=
"position: relative;
margin-bottom: 10px;
"
>
<div
class=
"b-feeds-stat_controls form-group"
>
<?php
/* Переключатель страниц */
?>
...
...
@@ -148,10 +148,6 @@ if (!$error) {
<a
class=
"btn btn-primary submit-action"
href=
"#"
action=
"
<?=
$form_link
?>
"
method=
"post"
>
<?=
_t
(
'Сохранить'
)
?>
</a>
<a
class=
"btn btn-default cancel-action"
href=
"
<?=
$link_cancel
?>
"
>
<?=
_t
(
'Отмена'
)
?>
</a>
</div>
</div>
</section>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment