diff options
| author | Felipe Artur <felipefac@gmail.com> | 2018-02-19 16:06:16 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2018-03-03 12:56:17 -0300 |
| commit | dd071c4b6e9754a0abeec45ab2040d9e2d5a62b8 (patch) | |
| tree | 9dda99bb987378cb6cbc95d236757d11f21176a6 /app/controllers/groups | |
| parent | 98fecb5f8e64c4c64c96d065bc342d986140367e (diff) | |
| download | gitlab-ce-dd071c4b6e9754a0abeec45ab2040d9e2d5a62b8.tar.gz | |
Bring one group board to CE
Diffstat (limited to 'app/controllers/groups')
| -rw-r--r-- | app/controllers/groups/boards_controller.rb | 27 | ||||
| -rw-r--r-- | app/controllers/groups/labels_controller.rb | 16 |
2 files changed, 39 insertions, 4 deletions
diff --git a/app/controllers/groups/boards_controller.rb b/app/controllers/groups/boards_controller.rb new file mode 100644 index 00000000000..7c2016f0326 --- /dev/null +++ b/app/controllers/groups/boards_controller.rb @@ -0,0 +1,27 @@ +class Groups::BoardsController < Groups::ApplicationController + include BoardsResponses + + before_action :assign_endpoint_vars + + def index + @boards = Boards::ListService.new(group, current_user).execute + + respond_with_boards + end + + def show + @board = group.boards.find(params[:id]) + + respond_with_board + end + + def assign_endpoint_vars + @boards_endpoint = group_boards_url(group) + @namespace_path = group.to_param + @labels_endpoint = group_labels_url(group) + end + + def serialize_as_json(resource) + resource.as_json(only: [:id]) + end +end diff --git a/app/controllers/groups/labels_controller.rb b/app/controllers/groups/labels_controller.rb index ac1d97dc54a..58be330f466 100644 --- a/app/controllers/groups/labels_controller.rb +++ b/app/controllers/groups/labels_controller.rb @@ -35,10 +35,18 @@ class Groups::LabelsController < Groups::ApplicationController def create @label = Labels::CreateService.new(label_params).execute(group: group) - if @label.valid? - redirect_to group_labels_path(@group) - else - render :new + respond_to do |format| + format.html do + if @label.valid? + redirect_to group_labels_path(@group) + else + render :new + end + end + + format.json do + render json: LabelSerializer.new.represent_appearance(@label) + end end end |