Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • A administrate
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 96
    • Issues 96
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 32
    • Merge requests 32
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • thoughtbot, inc.
  • administrate
  • Merge requests
  • !1925

Bump to v0.15.0

  • Review changes

  • Download
  • Email patches
  • Plain diff
Closed Nicholas Hippenmeyer requested to merge github/fork/rinsed-org/nch/v0.15.0 into master 4 years ago
  • Overview 6
  • Commits 7
  • Pipelines 0
  • Changes 5
Compare
  • master (base)

and
  • latest version
    b7c1de7b
    7 commits, 2 years ago

5 files
+ 18
- 3

    Preferences

    File browser
    Compare changes
a‎pp‎
assets/javascri‎pts/administrate‎
compo‎nents‎
associa‎tive.js‎ +2 -0
applica‎tion.js‎ +0 -1
views/fiel‎ds/has_many‎
_show.h‎tml.erb‎ +1 -1
lib/adminis‎trate/field‎
has_m‎any.rb‎ +15 -0
spec/example_app/ap‎p/assets/javascripts‎
applica‎tion.js‎ +0 -1
app/assets/javascripts/administrate/components/associative.js
+ 2
- 0
  • View file @ b7c1de7b

$(function() {
$(function() {
 
$('.field-unit--select select').selectize({});
$('.field-unit--belongs-to select').selectize({});
$('.field-unit--belongs-to select').selectize({});
$(".field-unit--has-many select").selectize({});
$(".field-unit--has-many select").selectize({});
$('.field-unit--polymorphic select').selectize({});
$('.field-unit--polymorphic select').selectize({});
 
$('.field-unit--audience-field select').selectize({});
});
});
app/assets/javascripts/administrate/application.js
+ 0
- 1
  • View file @ b7c1de7b


//= require jquery
//= require jquery
//= require jquery_ujs
//= require selectize
//= require selectize
//= require moment
//= require moment
//= require datetime_picker
//= require datetime_picker
app/views/fields/has_many/_show.html.erb
+ 1
- 1
  • View file @ b7c1de7b


@@ -22,7 +22,7 @@ from the associated resource class's dashboard.
@@ -22,7 +22,7 @@ from the associated resource class's dashboard.
<% order = field.order_from_params(params.fetch(field.name, {})) %>
<% order = field.order_from_params(params.fetch(field.name, {})) %>
<% page_number = params.fetch(field.name, {}).fetch(:page, nil) %>
<% page_number = params.fetch(field.name, {}).fetch(:page, nil) %>
<%= render(
<%= render(
"collection",
field.collection_partial(namespace),
collection_presenter: field.associated_collection(order),
collection_presenter: field.associated_collection(order),
collection_field_name: field.name,
collection_field_name: field.name,
page: page,
page: page,
lib/administrate/field/has_many.rb
+ 15
- 0
  • View file @ b7c1de7b


@@ -35,6 +35,21 @@ module Administrate
@@ -35,6 +35,21 @@ module Administrate
end
end
end
end
 
def collection_partial(namespace)
 
partial = 'collection'
    • Administrator
      Administrator @root · 4 years ago
      Contributor

      Created by: hound[bot]

      Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

      • Please register or sign in to reply
Please register or sign in to reply
 
prefix = options[:class_name].try(:underscore).try(:pluralize) || name
 
view_paths = ActionView::PathSet.new(["app/views/#{namespace}"])
 
lookup_context = ActionView::LookupContext.new(view_paths)
 
 
resouce_template_exists = lookup_context.exists?(partial, [namespace, prefix], true)
    • Administrator
      Administrator @root · 4 years ago
      Contributor

      Created by: hound[bot]

      Metrics/LineLength: Line is too long. [92/80]

      • Please register or sign in to reply
Please register or sign in to reply
 
return [namespace, prefix, partial].join('/') if resouce_template_exists
    • Administrator
      Administrator @root · 4 years ago
      Contributor

      Created by: hound[bot]

      Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

      • Please register or sign in to reply
Please register or sign in to reply
 
 
application_template_exists = lookup_context.exists?(partial, [namespace, '/'], true)
    • Administrator
      Administrator @root · 4 years ago
      Contributor

      Created by: hound[bot]

      Metrics/LineLength: Line is too long. [93/80]
      Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

      • Please register or sign in to reply
Please register or sign in to reply
 
return [namespace, partial].join('/') if application_template_exists
    • Administrator
      Administrator @root · 4 years ago
      Contributor

      Created by: hound[bot]

      Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

      • Please register or sign in to reply
Please register or sign in to reply
 
 
['administrate', 'application', partial].join('/')
    • Administrator
      Administrator @root · 4 years ago
      Contributor

      Created by: hound[bot]

      Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

      • Please register or sign in to reply
Please register or sign in to reply
 
end
 
def selected_options
def selected_options
return if data.empty?
return if data.empty?
spec/example_app/app/assets/javascripts/application.js
+ 0
- 1
  • View file @ b7c1de7b


@@ -11,5 +11,4 @@
@@ -11,5 +11,4 @@
// about supported directives.
// about supported directives.
//
//
//= require jquery
//= require jquery
//= require jquery_ujs
//= require_tree .
//= require_tree .
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
1
meta
1
meta
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
0
0 participants
Reference: twbs/bootstrap!24071
Source branch: github/fork/rinsed-org/nch/v0.15.0

Menu

Explore Projects Groups Snippets