deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rewrite and improve git backend logic. Fix project movind. Raise exception to prevent unexpected issues

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-11-27 09:31:15 +03:00
parent 70bf7f6e19
commit f5551efdfd
20 changed files with 146 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/admin/dashboard/index.html.haml
View file

@ -28,6 +28,8 @@
%h1= Project.count
%hr
= link_to 'New Project', new_project_path, class: "btn small"
 
= link_to 'New Group', new_admin_group_path, class: "btn small"
.span4
.ui-box
%h5 Users
@ -44,7 +46,7 @@
%hr
- @projects.each do |project|
%p
= link_to project.name, [:admin, project]
= link_to project.name_with_namespace, [:admin, project]
.span6
%h3 Latest users
%hr

22
app/views/admin/groups/new.html.haml
View file

@ -1,3 +1,21 @@
%h3.page_title New Group
%br
= render 'form'
%hr
= form_for [:admin, @group] do |f|
- if @group.errors.any?
.alert-message.block-message.error
%span= @group.errors.full_messages.first
.clearfix
= f.label :name do
Group name is
.input
= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
 
= f.submit 'Create group', class: "btn primary"
%hr
.padded
%ul
%li Group is kind of directory for several projects
%li All created groups are private
%li People within a group see only projects they have access to
%li All projects of group will be stored in group directory
%li You will be able to move existing projects into group

18
app/views/admin/groups/show.html.haml
View file

@ -22,7 +22,7 @@
%b
Path:
%td
= @group.path
%span.monospace= File.join(Gitlab.config.git_base_path, @group.path)
%tr
%td
%b
@ -43,10 +43,14 @@
= link_to 'Remove from group', remove_project_admin_group_path(@group, project_id: project.id), confirm: 'Are you sure?', method: :delete, class: "btn danger small"
.clearfix
%br
%h3 Add new project
%br
= form_tag project_update_admin_group_path(@group), class: "bulk_import", method: :put do
= select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5'
.form-actions
= submit_tag 'Add', class: "btn primary"
%fieldset
%legend Move projects to group
.clearfix
= label_tag :project_ids do
Projects
.input
= select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5'
.form-actions
= submit_tag 'Add', class: "btn primary"

110
app/views/admin/users/_form.html.haml
View file

@ -6,52 +6,42 @@
- @admin_user.errors.full_messages.each do |msg|
%li= msg
.row
.span7
.ui-box
%br
.clearfix
= f.label :name
.input
= f.text_field :name
%span.help-inline * required
.clearfix
= f.label :username
.input
= f.text_field :username
%span.help-inline * required
.clearfix
= f.label :email
.input
= f.text_field :email
%span.help-inline * required
%hr
-if f.object.new_record?
.clearfix
= f.label :force_random_password do
%span Generate random password
.input= f.check_box :force_random_password, {}, true, nil
%fieldset
%legend Account
.clearfix
= f.label :name
.input
= f.text_field :name, required: true
%span.help-inline * required
.clearfix
= f.label :username
.input
= f.text_field :username, required: true
%span.help-inline * required
.clearfix
= f.label :email
.input
= f.text_field :email, required: true
%span.help-inline * required
%div.password-fields
.clearfix
= f.label :password
.input= f.password_field :password, disabled: f.object.force_random_password
.clearfix
= f.label :password_confirmation
.input= f.password_field :password_confirmation, disabled: f.object.force_random_password
%hr
.clearfix
= f.label :skype
.input= f.text_field :skype
.clearfix
= f.label :linkedin
.input= f.text_field :linkedin
.clearfix
= f.label :twitter
.input= f.text_field :twitter
.span5
.ui-box
%br
%fieldset
%legend Password
.clearfix
= f.label :password
.input= f.password_field :password, disabled: f.object.force_random_password
.clearfix
= f.label :password_confirmation
.input= f.password_field :password_confirmation, disabled: f.object.force_random_password
-if f.object.new_record?
.clearfix
= f.label :force_random_password do
%span Generate random password
.input= f.check_box :force_random_password, {}, true, nil
%fieldset
%legend Access
.row
.span8
.clearfix
= f.label :projects_limit
.input= f.number_field :projects_limit
@ -60,23 +50,27 @@
= f.label :admin do
%strong.cred Administrator
.input= f.check_box :admin
.span4
- unless @admin_user.new_record?
%hr
.padded.cred
.alert.alert-error
- if @admin_user.blocked
%span
This user is blocked and is not able to login to GitLab
.clearfix
= link_to 'Unblock User', unblock_admin_user_path(@admin_user), method: :put, class: "btn small right"
%p This user is blocked and is not able to login to GitLab
= link_to 'Unblock User', unblock_admin_user_path(@admin_user), method: :put, class: "btn small"
- else
%span
Blocked users will be removed from all projects & will not be able to login to GitLab.
.clearfix
= link_to 'Block User', block_admin_user_path(@admin_user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn small right danger"
%p Blocked users will be removed from all projects & will not be able to login to GitLab.
= link_to 'Block User', block_admin_user_path(@admin_user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn small danger"
%fieldset
%legend Profile
.clearfix
= f.label :skype
.input= f.text_field :skype
.clearfix
= f.label :linkedin
.input= f.text_field :linkedin
.clearfix
= f.label :twitter
.input= f.text_field :twitter
.row
.span6
.span6
.actions
= f.submit 'Save', class: "btn save-btn"
- if @admin_user.new_record?

5
app/views/admin/users/edit.html.haml
View file

@ -1,3 +1,6 @@
%h3.page_title #{@admin_user.name} → Edit user
%h3.page_title
#{@admin_user.name} →
%i.icon-edit
Edit user
%hr
= render 'form'

6
app/views/admin/users/new.html.haml
View file

@ -1,3 +1,5 @@
%h3.page_title New user
%br
%h3.page_title
%i.icon-plus
New user
%hr
= render 'form'