Merge pull request #455 from cachethq/api-component-tags

Component can be created with tags from API
This commit is contained in:
James Brooks
2015-02-18 19:06:38 +00:00
6 changed files with 26 additions and 6 deletions

View File

@@ -154,6 +154,6 @@ return [
'json' => new Dingo\Api\Http\ResponseFormat\JsonResponseFormat(),
]
],
];

View File

@@ -93,7 +93,7 @@ Route::group(['before' => 'auth', 'prefix' => 'dashboard', 'namespace' => 'Cache
Route::group(['before' => 'admin'], function () {
Route::get('add', [
'as' => 'dashboard.team.add',
'uses' => 'DashTeamController@showAddTeamMemberView'
'uses' => 'DashTeamController@showAddTeamMemberView',
]);
Route::get('{user}', 'DashTeamController@showTeamMemberView');
Route::post('add', 'DashTeamController@postAddUser');

View File

@@ -2,6 +2,7 @@
namespace CachetHQ\Cachet\Http\Controllers\Api;
use CachetHQ\Cachet\Models\Tag;
use CachetHQ\Cachet\Repositories\Component\ComponentRepository;
use Dingo\Api\Routing\ControllerTrait;
use GrahamCampbell\Binput\Facades\Binput;
@@ -71,7 +72,26 @@ class ComponentController extends Controller
*/
public function postComponents()
{
return $this->component->create($this->auth->user()->id, Binput::all());
$component = $this->component->create(
$this->auth->user()->id,
Binput::except('tags')
);
if (Binput::has('tags')) {
// The component was added successfully, so now let's deal with the tags.
$tags = preg_split('/ ?, ?/', Binput::get('tags'));
// For every tag, do we need to create it?
$componentTags = array_map(function ($taggable) use ($component) {
return Tag::firstOrCreate([
'name' => $taggable,
])->id;
}, $tags);
$component->tags()->sync($componentTags);
}
return $component;
}
/**

View File

@@ -87,7 +87,7 @@ class DashUserController extends Controller
public function regenerateApiKey(User $user)
{
segment_track('User Management', [
'event' => 'regenrated_api_token'
'event' => 'regenrated_api_token',
]);
$user->api_key = User::generateApiKey();

View File

@@ -88,7 +88,7 @@ class SetupController extends Controller
'settings.show_support' => 'boolean',
'user.username' => 'alpha_num|required',
'user.email' => 'email|required',
'user.password' => 'required'
'user.password' => 'required',
]);
if ($v->passes()) {

View File

@@ -34,7 +34,7 @@ class Component extends Model implements TransformableInterface
protected $rules = [
'user_id' => 'integer|required',
'name' => 'required',
'status' => 'integer',
'status' => 'integer|required',
'link' => 'url',
];