Skip to content

Add title #17

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.

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/yii2-workflow-manager.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Contributions are **welcome** and will be fully **credited**.

We accept contributions via Pull Requests on [Github](https://github.com/cornernote/yii2-returnurl).
We accept contributions via Pull Requests on [Github](https://github.com/victorsemenow/yii2-returnurl).


## Pull Requests
Expand Down
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Yii2 Workflow Manager

[![Latest Version](https://img.shields.io/github/tag/cornernote/yii2-workflow-manager.svg?style=flat-square&label=release)](https://github.com/cornernote/yii2-workflow-manager/tags)
[![Latest Version](https://img.shields.io/github/tag/victorsemenow/yii2-workflow-manager.svg?style=flat-square&label=release)](https://github.com/victorsemenow/yii2-workflow-manager/tags)
[![Software License](https://img.shields.io/badge/license-BSD-brightgreen.svg?style=flat-square)](LICENSE.md)
[![Build Status](https://img.shields.io/travis/cornernote/yii2-workflow-manager/master.svg?style=flat-square)](https://travis-ci.org/cornernote/yii2-workflow-manager)
[![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/cornernote/yii2-workflow-manager.svg?style=flat-square)](https://scrutinizer-ci.com/g/cornernote/yii2-workflow-manager/code-structure)
[![Quality Score](https://img.shields.io/scrutinizer/g/cornernote/yii2-workflow-manager.svg?style=flat-square)](https://scrutinizer-ci.com/g/cornernote/yii2-workflow-manager)
[![Total Downloads](https://img.shields.io/packagist/dt/cornernote/yii2-workflow-manager.svg?style=flat-square)](https://packagist.org/packages/cornernote/yii2-workflow-manager)
[![Build Status](https://img.shields.io/travis/victorsemenow/yii2-workflow-manager/master.svg?style=flat-square)](https://travis-ci.org/victorsemenow/yii2-workflow-manager)
[![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/victorsemenow/yii2-workflow-manager.svg?style=flat-square)](https://scrutinizer-ci.com/g/victorsemenow/yii2-workflow-manager/code-structure)
[![Quality Score](https://img.shields.io/scrutinizer/g/victorsemenow/yii2-workflow-manager.svg?style=flat-square)](https://scrutinizer-ci.com/g/victorsemenow/yii2-workflow-manager)
[![Total Downloads](https://img.shields.io/packagist/dt/victorsemenow/yii2-workflow-manager.svg?style=flat-square)](https://packagist.org/packages/victorsemenow/yii2-workflow-manager)

Workflow Manager for Yii2. Extends [Yii2-Workflow](https://github.com/raoul2000/yii2-workflow/) to provide an interface to manage workflows.

Expand All @@ -26,13 +26,13 @@ The preferred way to install this extension is through [composer](http://getcomp
Either run

```
$ composer require cornernote/yii2-workflow-manager "*"
$ composer require victorsemenow/yii2-workflow-manager "*"
```

or add

```
"cornernote/yii2-workflow-manager": "*"
"victorsemenow/yii2-workflow-manager": "*"
```

to the `require` section of your `composer.json` file.
Expand All @@ -41,7 +41,7 @@ to the `require` section of your `composer.json` file.
## Migrations

```
$ php yii migrate --migrationPath=@cornernote/workflow/manager/migrations
$ php yii migrate --migrationPath=@victorsemenow/workflow/manager/migrations
```


Expand All @@ -51,12 +51,12 @@ $ php yii migrate --migrationPath=@cornernote/workflow/manager/migrations
$config = [
'components' => [
'workflowSource' => [
'class' => 'cornernote\workflow\manager\components\WorkflowDbSource',
'class' => 'victorsemenow\workflow\manager\components\WorkflowDbSource',
],
],
'modules' => [
'workflow' => [
'class' => 'cornernote\workflow\manager\Module',
'class' => 'victorsemenow\workflow\manager\Module',
],
],
];
Expand Down Expand Up @@ -89,16 +89,16 @@ class Post extends \yii\db\ActiveRecord
## License

- Author: Brett O'Donnell <cornernote@gmail.com>
- Source Code: https://github.com/cornernote/yii2-workflow-manager
- Source Code: https://github.com/victorsemenow/yii2-workflow-manager
- Copyright © 2016 Mr PHP <info@mrphp.com.au>
- License: BSD-3-Clause https://raw.github.com/cornernote/yii2-workflow-manager/master/LICENSE
- License: BSD-3-Clause https://raw.github.com/victorsemenow/yii2-workflow-manager/master/LICENSE


## Links

- [Yii2 Extension](http://www.yiiframework.com/extension/yii2-workflow-manager)
- [Composer Package](https://packagist.org/packages/cornernote/yii2-workflow-manager)
- [Composer Package](https://packagist.org/packages/victorsemenow/yii2-workflow-manager)
- [MrPHP](http://mrphp.com.au)


[![Mr PHP](https://raw.github.com/cornernote/mrphp-assets/master/img/code-banner.png)](http://mrphp.com.au)
[![Mr PHP](https://raw.github.com/victorsemenow/mrphp-assets/master/img/code-banner.png)](http://mrphp.com.au)
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"name": "cornernote/yii2-workflow-manager",
"name": "victorsemenov/yii2-workflow-manager",
"description": "Workflow Manager for Yii2.",
"keywords": ["yii2", "workflow"],
"type": "yii2-extension",
"license": "BSD-3-Clause",
"authors": [
{
"name": "Brett O'Donnell",
"email": "cornernote@gmail.com",
"homepage": "http://mrphp.com.au/"
"name": "Victor V. Semenov ",
"email": "victorvsemenow@gmail.com"
}
],
"require": {
"yiisoft/yii2": "*",
"yiisoft/yii2-jui": "~2.0.0",
"raoul2000/yii2-workflow": "@dev",
"raoul2000/yii2-workflow-view": "@dev"
"raoul2000/yii2-workflow-view": "@dev",
"kartik-v/yii2-icons": "@dev"
},
"require-dev": {
"phpunit/phpunit": "4.*",
"scrutinizer/ocular": "~1.1"
},
"autoload": {
"psr-4": {"cornernote\\workflow\\manager\\": "src"}
"psr-4": {"victorsemenov\\workflow\\manager\\": "src"}
}
}
8 changes: 4 additions & 4 deletions src/Module.php
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?php

namespace cornernote\workflow\manager;
namespace victorsemenow\workflow\manager;

use Yii;

/**
* Class Module
* @package cornernote\workflow\manager
* @package victorsemenow\workflow\manager
*/
class Module extends \yii\base\Module
{
/**
* @var string
*/
public $controllerNamespace = 'cornernote\workflow\manager\controllers';
public $controllerNamespace = 'victorsemenow\workflow\manager\controllers';
/**
* @var string
*/
Expand All @@ -26,7 +26,7 @@ public function init()
Yii::$app->i18n->translations['workflow'] = [
'class' => 'yii\i18n\PhpMessageSource',
'sourceLanguage' => 'en-US',
'basePath' => '@cornernote/workflow/manager/messages'
'basePath' => '@victorsemenow/workflow/manager/messages'
];
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/components/WorkflowDbSource.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace cornernote\workflow\manager\components;
namespace victorsemenow\workflow\manager\components;

use raoul2000\workflow\base\SimpleWorkflowBehavior;
use raoul2000\workflow\base\Status;
Expand Down Expand Up @@ -163,7 +163,7 @@ public function getStatus($id, $model = null)
$this->_s[$wId] = [];
}
if (!array_key_exists($canonicalStId, $this->_s[$wId])) {
$statusModel = \cornernote\workflow\manager\models\Status::findOne([
$statusModel = \victorsemenow\workflow\manager\models\Status::findOne([
'workflow_id' => $wId,
'id' => $stId
]);
Expand All @@ -190,8 +190,8 @@ public function getAllStatuses($workflowId)
{
if (empty($this->_allStatusLoaded[$workflowId])) {
$this->_s[$workflowId] = [];
/** @var \cornernote\workflow\manager\models\Status[] $statusModels */
$statusModels = \cornernote\workflow\manager\models\Status::find()
/** @var \victorsemenow\workflow\manager\models\Status[] $statusModels */
$statusModels = \victorsemenow\workflow\manager\models\Status::find()
->where(['workflow_id' => $workflowId])
//->andWhere(['NOT IN', 'id', array_keys($this->_s[$workflowId])]) // removed to fix sort order
->orderBy(['sort_order' => SORT_ASC])
Expand Down Expand Up @@ -227,7 +227,7 @@ public function getTransitions($statusId, $model = null)
}
if (!array_key_exists($statusId, $this->_t[$wId])) {
$transitions = [];
$transitionModels = \cornernote\workflow\manager\models\Transition::find()
$transitionModels = \victorsemenow\workflow\manager\models\Transition::find()
->andWhere([
'{{%sw_transition}}.workflow_id' => $wId,
'{{%sw_transition}}.start_status_id' => $stId,
Expand Down Expand Up @@ -334,13 +334,13 @@ public function getWorkflowDefinition($id)
* Loads the definition oa a workflow.
*
* @param string $id
* @return \cornernote\workflow\manager\models\Workflow
* @return \victorsemenow\workflow\manager\models\Workflow
* @throws WorkflowException
* @internal param IWorkflowSource $source
*/
public function loadDefinition($id)
{
$workflowModel = \cornernote\workflow\manager\models\Workflow::findOne(['id' => $id]);
$workflowModel = \victorsemenow\workflow\manager\models\Workflow::findOne(['id' => $id]);
if (!$workflowModel) {
return null;
//throw new WorkflowException('No workflow found with id ' . $id);
Expand Down
10 changes: 5 additions & 5 deletions src/controllers/DefaultController.php
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?php

namespace cornernote\workflow\manager\controllers;
namespace victorsemenow\workflow\manager\controllers;

use cornernote\workflow\manager\models\Status;
use cornernote\workflow\manager\models\Transition;
use cornernote\workflow\manager\models\Workflow;
use victorsemenow\workflow\manager\models\Status;
use victorsemenow\workflow\manager\models\Transition;
use victorsemenow\workflow\manager\models\Workflow;
use Yii;
use yii\web\Controller;
use yii\web\HttpException;

/**
* Class DefaultController
* @package cornernote\workflow\manager\controllers
* @package victorsemenow\workflow\manager\controllers
*/
class DefaultController extends Controller
{
Expand Down
6 changes: 3 additions & 3 deletions src/controllers/StatusController.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace cornernote\workflow\manager\controllers;
namespace victorsemenow\workflow\manager\controllers;

use cornernote\workflow\manager\models\form\StatusForm;
use cornernote\workflow\manager\models\Status;
use victorsemenow\workflow\manager\models\form\StatusForm;
use victorsemenow\workflow\manager\models\Status;
use Yii;
use yii\web\Controller;
use yii\web\HttpException;
Expand Down
5 changes: 5 additions & 0 deletions src/messages/ru-RU/workflow.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

return [
'Workflow' => 'Рабочий процесс',
];
50 changes: 50 additions & 0 deletions src/migrations/m201204_224340_add_title_sw_workflow.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?php
use yii\db\Schema;
use yii\db\Migration;

/**
* Class m201204_224340_add_title_sw_workflow
*/
class m201204_224340_add_title_sw_workflow extends Migration
{
/**
* {@inheritdoc}
*/
public function safeUp()
{
echo "m201204_224340_add_title_sw_workflow.\n";
$this->addColumn('{{%sw_workflow}}'
, 'title'
, $this->varchar(32)->defaultValue(null));

}

/**
* {@inheritdoc}
*/
public function safeDown()
{
echo "m201204_224340_add_title_sw_workflow to be reverted.\n";


if($this->dropColumn('{{%sw_status}}', 'title'))
echo "m201204_224340_add_title_sw_workflow cannot be reverted.\n";

return false;
}

/*
// Use up()/down() to run migration code without a transaction.
public function up()
{

}

public function down()
{
echo "m201204_224340_add_title_sw_workflow cannot be reverted.\n";

return false;
}
*/
}
2 changes: 1 addition & 1 deletion src/models/Metadata.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace cornernote\workflow\manager\models;
namespace victorsemenow\workflow\manager\models;

use Yii;
use yii\db\ActiveRecord;
Expand Down
2 changes: 1 addition & 1 deletion src/models/Status.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace cornernote\workflow\manager\models;
namespace victorsemenow\workflow\manager\models;

use Yii;
use yii\db\ActiveRecord;
Expand Down
2 changes: 1 addition & 1 deletion src/models/Transition.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace cornernote\workflow\manager\models;
namespace victorsemenow\workflow\manager\models;

use Yii;
use yii\db\ActiveRecord;
Expand Down
Loading