Skip to content

[4.0] State to stage fixes #21566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Aug 13, 2018
Merged

[4.0] State to stage fixes #21566

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
195851b
Fix errors in renaming state to stage for workflow
chmst Aug 12, 2018
124473e
Fix table
chmst Aug 12, 2018
31a33d3
Rename FormField workflowstate to workflowstage, fix more state to st…
chmst Aug 12, 2018
bc44d7e
Merge branch '4.0-dev' into state-to-stage-fixes
rdeutz Aug 12, 2018
4686b61
Fix Table Stage in Workflow $stage->default
chmst Aug 12, 2018
cf65e4d
Revert "Fix Table Stage in Workflow $stage->default"
chmst Aug 12, 2018
7338ff3
Fixed renaming errors in the workflow component
chmst Aug 12, 2018
e1cc511
oops
chmst Aug 12, 2018
833be56
Revert change in sql update, Rename and fix JHtmlWorkflowState / Stage
chmst Aug 12, 2018
edc87e6
Fixed state-stage renaming in Transition Field and Article Model
chmst Aug 12, 2018
8a83889
fix stage_id
chmst Aug 12, 2018
f758c82
Merge branch '4.0-dev' into state-to-stage-fixes
chmst Aug 12, 2018
63ead51
Merge branch '4.0-dev' into state-to-stage-fixes
chmst Aug 12, 2018
dd9fc63
Fix two more state => stage
bembelimen Aug 13, 2018
8f4de82
Merge pull request #2 from bembelimen/state-to-stage-fixes
chmst Aug 13, 2018
d56a94f
Fix error for createAssocciaton(..stageId), fix submenu
chmst Aug 13, 2018
6ffcc93
Merge branch 'state-to-stage-fixes' of https://github.com/chmst/jooml…
chmst Aug 13, 2018
72972d3
Improve Code - rename Variables and fix comments
chmst Aug 13, 2018
4819380
fix getStage-getState
chmst Aug 13, 2018
aafea67
Merge branch '4.0-dev' into state-to-stage-fixes
chmst Aug 13, 2018
8d6116f
Fix vname in sidebar
chmst Aug 13, 2018
0383ef5
fix insert into workflow_associations
chmst Aug 13, 2018
9d4458c
Merge branch '4.0-dev' into state-to-stage-fixes
chmst Aug 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions administrator/components/com_content/Model/ArticlesModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ protected function getListQuery()
->innerJoin($query->quoteName('#__workflow_associations', 'wa'))
->where($query->quoteName('wa.item_id') . ' = ' . $query->quoteName('a.id'));

// Join over the states.
// Join over the workflow stages.
$query ->select(
$query->quoteName(
[
Expand Down Expand Up @@ -319,11 +319,11 @@ protected function getListQuery()
}

// Filter by published state
$workflowState = (string) $this->getState('filter.state');
$workflowStage = (string) $this->getState('filter.state');

if (is_numeric($workflowState))
if (is_numeric($workflowStage))
{
$query->where('wa.stage_id = ' . (int) $workflowState);
$query->where('wa.stage_id = ' . (int) $workflowStage);
}

$condition = (string) $this->getState('filter.condition');
Expand All @@ -338,7 +338,7 @@ protected function getListQuery()
$query->where($db->quoteName('ws.condition') . ' = ' . $query->quote($condition));
}
}
elseif (!is_numeric($workflowState))
elseif (!is_numeric($workflowStage))
{
$query->where($db->quoteName('ws.condition') . ' IN (' . $query->quote(Workflow::PUBLISHED) . ',' . $query->quote(Workflow::UNPUBLISHED) . ')');
}
Expand Down
14 changes: 7 additions & 7 deletions administrator/components/com_content/Model/FeaturedModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ protected function getListQuery()
$query->select('ua.name AS author_name')
->join('LEFT', '#__users AS ua ON ua.id = a.created_by');

// Join over the states.
// Join over the workflow asociations.
$query->select('wa.stage_id AS stage_id')
->join('LEFT', '#__workflow_associations AS wa ON wa.item_id = a.id');

// Join over the states.
// Join over the workflow stages.
$query ->select(
$query->quoteName(
[
Expand Down Expand Up @@ -156,12 +156,12 @@ protected function getListQuery()
$query->where('c.access IN (' . $groups . ')');
}

// Filter by published state
$workflowState = (string) $this->getState('filter.state');
// Filter by workflows stages
$workflowStage = (string) $this->getStage('filter.state');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getStage ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops


if (is_numeric($workflowState))
if (is_numeric($workflowStage))
{
$query->where('wa.stage_id = ' . (int) $workflowState);
$query->where('wa.stage_id = ' . (int) $workflowStage);
}

$condition = (string) $this->getState('filter.condition');
Expand All @@ -170,7 +170,7 @@ protected function getListQuery()
{
$query->where($db->quoteName('ws.condition') . '=' . $db->quote($condition));
}
elseif (!is_numeric($workflowState))
elseif (!is_numeric($workflowStage))
{
$query->where($db->quoteName('ws.condition') . ' IN ("0","1")');
}
Expand Down