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
3eb73f09
Commit
3eb73f09
authored
Apr 01, 2020
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
правка для статистик по ajax-запросу
parent
e4013d8d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
amsystem-campaign.js
src/public/js/adm/amsystem-campaign.js
+1
-1
CabinetAmSystem.php
src/src/App/Action/User/CabinetAmSystem.php
+8
-1
campaign_item.phtml
src/templates/app/user/campaign_item.phtml
+0
-2
No files found.
src/public/js/adm/amsystem-campaign.js
View file @
3eb73f09
...
@@ -673,7 +673,7 @@ $(document).ready(function () {
...
@@ -673,7 +673,7 @@ $(document).ready(function () {
success
:
function
(
res
)
{
success
:
function
(
res
)
{
EnableLoadingState
(
$groupWrap
,
false
);
EnableLoadingState
(
$groupWrap
,
false
);
if
(
res
)
{
if
(
res
)
{
if
(
res
.
data
==
null
||
res
.
data
.
stat
==
null
)
{
if
(
res
.
data
==
null
||
(
res
.
type
==
'stat-common'
&&
res
.
data
.
stat
==
null
)
)
{
if
(
type
==
'stat-common'
)
ShowCommonStatInfo
();
if
(
type
==
'stat-common'
)
ShowCommonStatInfo
();
if
(
type
==
'stat-sites'
)
ShowSitesStatInfo
();
if
(
type
==
'stat-sites'
)
ShowSitesStatInfo
();
if
(
type
==
'stat-regions'
)
ShowRegionsStatInfo
();
if
(
type
==
'stat-regions'
)
ShowRegionsStatInfo
();
...
...
src/src/App/Action/User/CabinetAmSystem.php
View file @
3eb73f09
...
@@ -280,12 +280,19 @@ class CabinetAmSystem extends Common
...
@@ -280,12 +280,19 @@ class CabinetAmSystem extends Common
$campaign_id
=
$request
->
getAttribute
(
'id'
);
$campaign_id
=
$request
->
getAttribute
(
'id'
);
/** @var \App\Model\AmSystem\Groups $groupsModel */
$groupsModel
=
$this
->
container
->
get
(
\App\Model\AmSystem\Groups
::
class
);
/** @var \App\Model\AmSystem\Campaigns $campaignsModel */
/** @var \App\Model\AmSystem\Campaigns $campaignsModel */
$campaignsModel
=
$this
->
container
->
get
(
\App\Model\AmSystem\Campaigns
::
class
);
$campaignsModel
=
$this
->
container
->
get
(
\App\Model\AmSystem\Campaigns
::
class
);
$campaign
=
$campaignsModel
->
findById
(
$campaign_id
);
$campaign
=
$campaignsModel
->
findById
(
$campaign_id
);
if
(
$campaign
)
{
if
(
$campaign
)
{
if
(
$campaign
->
getUserId
()
==
$userId
){
$group_id
=
$campaign
->
getGroupId
();
$group
=
$groupsModel
->
findOne
([
'id'
=>
$group_id
]);
if
(
$group
->
getUserId
()
==
$userId
)
{
/** @var \App\Model\Statistics $stats */
/** @var \App\Model\Statistics $stats */
$stats
=
$this
->
container
->
get
(
\App\Model\Statistics
::
class
);
$stats
=
$this
->
container
->
get
(
\App\Model\Statistics
::
class
);
...
...
src/templates/app/user/campaign_item.phtml
View file @
3eb73f09
...
@@ -528,8 +528,6 @@ if (!$error) {
...
@@ -528,8 +528,6 @@ if (!$error) {
</div>
</div>
</div>
</div>
</div>
</div>
...
...
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