upmin-admin 0.0.39 → 0.1.0

data/app/views/upmin/models/show.html.haml

@@ -9,13 +9,13 @@
       %button.close{"data-dismiss" => "alert", type: "button"}
         %span{"aria-hidden" => "true"} ×
       = alert
-      - if @model.instance.errors.any?
+      - if @model.errors.any?
         %ul
-          - @model.instance.errors.each do |field, error|
+          - @model.errors.each do |field, error|
             %li
               %b
                 = field
               = error
   .row
     .col-sm-12
-      = up_model(@model.instance)
+      = up_render(@model)

data/app/views/upmin/partials/actions/_action.html.haml

@@ -1,24 +1,9 @@
+%h4{style: "color: #333;"}
+  = action.title
 .well.action-well
-  = form_tag(upmin_action_path(upmin_model.path_hash.merge(method: action_name))) do
-    - upmin_model.action_parameters(action_name).each do |param_type, param_name|
-
-      - next if param_type == :block # Skip blocks
-
-      .form-group
-        = label(action_name, param_name, param_name.to_s.capitalize.gsub("_", " "))
-
-        - if param_type == :opt
-          .input-group
-            = text_field(action_name, param_name, class: "form-control")
-            .input-group-addon.nilable-addon
-              .form-group
-                %label{for: "#{action_name}_#{param_name}_is_nil"}
-                  Do Not Provide
-                = check_box(action_name, "#{param_name}_is_nil", class: "boolean")
-          %small
-            * Optional
-        - else
-          = text_field(action_name, param_name, class: "form-control")
-
+  = form_tag(action.path, class: action.name) do
+    - action.parameters.each do |parameter|
+      -# = Upmin::Railties::RenderHelpers.parameter_partials(parameter)
+      = up_render(parameter)
 
     = submit_tag("Submit", class: "btn btn-primary")

data/app/views/upmin/partials/associations/_associations.html.haml

@@ -1,14 +1,12 @@
-- if associations.any?
-  %p
-    - associations.each do |u|
-      - nested_upmin_model = Upmin::Model.new(u)
-      %a.active-tag-link{href: upmin_model_path(nested_upmin_model.path_hash)}
-        %span.label{class: nested_upmin_model.color}
-          = nested_upmin_model.title
+%h5
+  = association.title
 
-- else
+- if association.empty?
   %p.well
     None
 
-
-
+- else
+  - association.upmin_values.each do |m|
+    %a.active-tag-link{href: m.path}
+      %span.label{class: m.color}
+        = m.title

data/app/views/upmin/partials/attributes/_boolean.html.haml

@@ -1,8 +1,10 @@
-- boolean ||= "false"
+.form-group{class: attribute.errors? ? "has-error" : ""}
+  %label{for: attribute.form_id}
+    = attribute.label_name
 
-- if editable && f = form_builder
-  = f.check_box(attr_name, value: boolean, class: "boolean")
+  - if attribute.editable? && f = form_builder
+    = f.check_box(attribute.name, value: boolean, class: "boolean")
 
-- else
-  %p.well
-    = f.check_box(attr_name, {value: boolean, class: "boolean", disabled: "disabled"})
+  - else
+    %p.well
+      = attribute.value

data/app/views/upmin/partials/attributes/_datetime.html.haml

@@ -1,36 +1,38 @@
-- datetime ||= nil
-- datetime_str = datetime.utc.iso8601 if datetime
-- if editable && f = form_builder
-  .row.datetime-attribute{class: form_id}
-    = f.hidden_field(attr_name, value: datetime_str)
-    - # TODO(jon): Figure out a better way to do transforms. This works for now though.
-    = f.hidden_field("transforms[#{attr_name}]", value: "DateTime#parse")
-
-    .col-xs-12.col-md-4
-      .input-group.pikadate
-        %input.form-control{type: :text, value: datetime_str, id: "#{form_id}-date"}
-        %span.input-group-addon
-          %span.glyphicon.glyphicon-calendar
-
-    .col-xs-12.col-md-4
-      .input-group.clockpicker{"data-align" => "top", "data-autoclose" => "true", "data-placement" => "right"}
-        %input.form-control{:type => "text", :value => datetime_str, id: "#{form_id}-time"}
-        %span.input-group-addon
-          %span.glyphicon.glyphicon-time
-
-    .col-xs-12.col-md-4
-      %small
-        Date & Time are shown in UTC. If not time is provided, the current time in UTC will be used.
-
-
-  - content_for(:javascript) do
-    :javascript
-      $(document).ready(function() {
-        window.Upmin.Attributes.DateTime("#{form_id}");
-      });
-
-
-- else
-  %p.well
-    -# TODO(jon): Make this show an uneditable date and time field.
-    = datetime
+- iso8601 = attribute.value.nil? ? nil : attribute.value.utc.iso8601
+
+.form-group{class: attribute.errors? ? "has-error" : ""}
+  %label{for: attribute.form_id}
+    = attribute.label_name
+
+  - if attribute.editable? && f = form_builder
+    .row.datetime-attribute{class: attribute.form_id}
+      = f.hidden_field(attribute.name, value: iso8601)
+
+      .col-xs-12.col-md-4
+        .input-group.pikadate
+          %input.form-control{type: :text, value: iso8601, id: "#{attribute.form_id}-date"}
+          %span.input-group-addon
+            %span.glyphicon.glyphicon-calendar
+
+      .col-xs-12.col-md-4
+        .input-group.clockpicker{"data-align" => "top", "data-autoclose" => "true", "data-placement" => "right"}
+          %input.form-control{type: "text", value: iso8601, id: "#{attribute.form_id}-time"}
+          %span.input-group-addon
+            %span.glyphicon.glyphicon-time
+
+      .col-xs-12.col-md-4
+        %small
+          Date & Time are shown in UTC. If no time is provided, the current time in UTC will be used.
+
+
+    - content_for(:javascript) do
+      :javascript
+        $(document).ready(function() {
+          window.Upmin.Attributes.DateTime("#{attribute.form_id}");
+        });
+
+
+  - else
+    %p.well
+      -# TODO(jon): Make this show an uneditable date and time field.
+      = iso8601

data/app/views/upmin/partials/attributes/_decimal.html.haml

@@ -0,0 +1,10 @@
+.form-group{class: attribute.errors? ? "has-error" : ""}
+  %label{for: attribute.form_id}
+    = attribute.label_name
+
+  - if attribute.editable? && f = form_builder
+    = f.text_field(attribute.name, value: attribute.value, class: "form-control")
+
+  - else
+    %p.well
+      = attribute.value

data/app/views/upmin/partials/attributes/_float.html.haml

@@ -1,7 +1,11 @@
-- float ||= nil
-- if editable && f = form_builder
-  = f.text_field(attr_name, value: float, class: "form-control")
 
-- else
-  %p.well
-    = float
+.form-group{class: attribute.errors? ? "has-error" : ""}
+  %label{for: attribute.form_id}
+    = attribute.label_name
+
+  - if attribute.editable? && f = form_builder
+    = f.text_field(attribute.name, value: attribute.value, class: "form-control")
+
+  - else
+    %p.well
+      = attribute.value

data/app/views/upmin/partials/attributes/_integer.html.haml

@@ -1,7 +1,11 @@
-- integer ||= nil
-- if editable && f = form_builder
-  = f.number_field(attr_name, value: integer, class: "form-control")
 
-- else
-  %p.well
-    = integer
+.form-group{class: attribute.errors? ? "has-error" : ""}
+  %label{for: attribute.form_id}
+    = attribute.label_name
+
+  - if attribute.editable? && f = form_builder
+    = f.number_field(attribute.name, value: attribute.value, class: "form-control")
+
+  - else
+    %p.well
+      = attribute.value

data/app/views/upmin/partials/attributes/_progress_bar.html.haml

@@ -1,3 +1,4 @@
+-# TODO(jon): Turn this into a widget
 - state ||= nil
 - states ||= []
 %ol.progbar{data: { "progbar-steps" => states.length }}

data/app/views/upmin/partials/attributes/_string.html.haml

@@ -1,7 +1,18 @@
-- string ||= nil
-- if editable && f = form_builder
-  = f.text_field(attr_name, value: string, class: "form-control")
+- is_nil = model.new_record? ? false : attribute.value.nil?
 
-- else
-  %p.well
-    = string
+.form-group{class: attribute.errors? ? "has-error" : ""}
+  %label{for: attribute.form_id}
+    = attribute.label_name
+
+  - if attribute.editable? && f = form_builder
+    .input-group
+      = f.text_field(attribute.name, value: attribute.value, class: "form-control")
+      .input-group-addon.nilable-addon
+        .form-group
+          %label{for: "#{attribute.form_id}_is_nil"}
+            Make this Nil
+          = check_box(model.underscore_name, "#{attribute.name}_is_nil", class: "boolean", checked: is_nil, value: is_nil)
+
+  - else
+    %p.well
+      = attribute.value

data/app/views/upmin/partials/attributes/_text.html.haml

@@ -1,7 +1,9 @@
-- text ||= nil
-- if editable && f = form_builder
-  = f.text_area(attr_name, value: text, rows: 4, class: "form-control")
+.form-group{class: attribute.errors? ? "has-error" : ""}
+  %label{for: attribute.form_id}
+    = attribute.label_name
+  - if attribute.editable? && f = form_builder
+    = f.text_area(attribute.name, value: attribute.value, rows: 4, class: "form-control")
 
-- else
-  %p.well
-    = text
+  - else
+    %p.well
+      = attribute.value

data/app/views/upmin/partials/attributes/_unknown.html.haml

@@ -1,3 +1,5 @@
-- unknown ||= nil
-%p.well
-  = unknown
+.form-group{class: attribute.errors? ? "has-error" : ""}
+  %label{for: attribute.form_id}
+    = attribute.label_name
+  %p.well
+    = attribute.value

data/app/views/upmin/partials/models/_model.html.haml

@@ -1,72 +1,44 @@
--# The following are all available to you here:
--# unknown - This is the model passed into the up_model method.
--#    This attribute is always present in any partial rendered
--#    by Upmin, and will always match the name of the partial
--#    *UNLESS* nil, true, or false are passed in.
--# upmin_model - This is an Upmin::Model instantiated with unknown
--#    and is always present.
--#
--# In general, the upmin_model makes it significantly easier to
--# render a view, so I suggest using it. It is way simpler than
--# trying to find all associations for a model on your own.
--#
--# Just an FYI: upmin_model.instance == unknown
-
-.upmin-model{class: upmin_model.color}
-  -# Display the model title as "Model # ID"
+.upmin-model{class: model.color}
   %h3
-    = upmin_model.title
+    = model.title
 
   %br
   %br
   %h3{style: "color: #333;"}
     Attributes
   %hr
-  -# Create a form to wrap the attributes in.
-  -# TODO(jon): Update the URL with a decent helper?
-  = form_for(upmin_model.instance, url: upmin_model_path(upmin_model.path_hash), html: { method: :put }) do |f|
-
-    -# Render each attribute
-    - upmin_model.klass.attributes.each do |attribute|
-      - any_errors = model.errors[attribute].any?
-      .form-group{class: any_errors ? "has-error" : ""}
-        -# = f.label(attribute.to_s) # Not using this because it drops _id and this isn't always desirable
-
-        %label{for: upmin_model.attribute_form_id(attribute)}
-          = upmin_model.attribute_label_name(attribute)
-        - if upmin_model.attribute_type(attribute) == :string
-          = up_attribute(upmin_model.instance, attribute, locals: { form_builder: f }, as: :nilable)
-        - else
-          = up_attribute(upmin_model.instance, attribute, locals: { form_builder: f })
 
+  .attributes
+    -# Yes this is meant to be model.model - this is the raw rails model instance.
+    = form_for(model, url: model.path, html: { method: :put }) do |f|
 
-    = f.submit("Save", class: "btn btn-primary")
+      -# Render each attribute
+      - model.attributes.each do |attribute|
+        = up_render(attribute, locals: { form_builder: f })
 
+      = f.submit("Save", class: "btn btn-primary")
 
 
-  - if upmin_model.klass.associations.any?
+  - if model.associations.any?
     %br
     %br
     %br
     %h3{style: "color: #333;"}
       Associations
     %hr
-    - upmin_model.klass.associations.each do |association|
-      %h5
-        = association.to_s.humanize
-      = up_association(upmin_model.instance, association, limit: 5)
+    .associations
+      - model.associations.each do |association|
+        = up_render(association)
 
-  - if upmin_model.klass.actions.any?
+
+  - if model.actions.any?
     %br
     %br
     %br
     %h3{style: "color: #333;"}
       Actions
     %hr
-    - upmin_model.klass.actions.each do |action|
-      %h4{style: "color: #333;"}
-        = action.to_s.capitalize.humanize
-      = up_action(upmin_model.instance, action)
-
-
+    .actions
+      - model.actions.each do |action|
+        = up_render(action)
 

data/app/views/upmin/partials/models/_new_model.html.haml

@@ -1,44 +1,22 @@
--# The following are all available to you here:
--# unknown - This is the model passed into the up_model method.
--#    This attribute is always present in any partial rendered
--#    by Upmin, and will always match the name of the partial
--#    *UNLESS* nil, true, or false are passed in.
--# upmin_model - This is an Upmin::Model instantiated with unknown
--#    and is always present.
--#
--# In general, the upmin_model makes it significantly easier to
--# render a view, so I suggest using it. It is way simpler than
--# trying to find all associations for a model on your own.
--#
--# Just an FYI: upmin_model.instance == unknown
 
-.upmin-model{class: upmin_model.color}
-  -# Display the model title as "Model # ID"
+.upmin-model{class: model.color}
   %h3
     Create a
-    = upmin_model.klass.humanized_name(:singular)
+    = model.humanized_name(:singular)
 
   %br
   %br
   %h3{style: "color: #333;"}
     Attributes
   %hr
-  -# Create a form to wrap the attributes in.
-  -# TODO(jon): Update the URL with a decent helper?
-  = form_for(upmin_model.instance, url: upmin_create_model_path(klass: @klass.name), html: { method: :post }) do |f|
 
-    -# Render each attribute
-    - upmin_model.klass.attributes.each do |attribute|
-      - any_errors = new_model.errors[attribute].any?
-      .form-group{class: any_errors ? "has-error" : ""}
-        -# = f.label(attribute.to_s) # Not using this because it drops _id and this isn't always desirable
+  .attributes
+    -# Yes this is meant to be model.model - this is the raw rails model instance.
+    = form_for(model, url: model.create_path, html: { method: :post }) do |f|
 
-        %label{for: upmin_model.attribute_form_id(attribute)}
-          = upmin_model.attribute_label_name(attribute)
-        - if upmin_model.attribute_type(attribute) == :string
-          = up_attribute(upmin_model.instance, attribute, locals: { form_builder: f }, as: :nilable)
-        - else
-          = up_attribute(upmin_model.instance, attribute, locals: { form_builder: f })
+      -# Render each attribute
+      - model.attributes.each do |attribute|
+        = up_render(attribute, locals: { form_builder: f })
 
-    = f.submit("Create", class: "btn btn-primary")
+      = f.submit("Create", class: "btn btn-primary")
 

data/app/views/upmin/partials/parameters/_opt_parameter.html.haml

@@ -0,0 +1,14 @@
+.form-group
+  %label{for: parameter.form_id}
+    = parameter.label_name
+
+  .input-group
+    = text_field(action.name, parameter.name, class: "form-control")
+    .input-group-addon.nilable-addon
+      .form-group
+        %label{for: parameter.nil_form_id}
+          Do Not Provide
+        = check_box(parameter.action.name, "#{parameter.name}_is_nil", class: "boolean")
+
+  %small
+    * Optional

data/app/views/upmin/partials/parameters/_req_parameter.html.haml

@@ -0,0 +1,4 @@
+.form-group
+  %label{for: parameter.form_id}
+    = parameter.label_name
+  = text_field(action.name, parameter.name, class: "form-control")

data/app/views/upmin/partials/search_boxes/_ransack_search_box.html.haml

@@ -3,11 +3,10 @@
   = klass.humanized_name
 
 -# Upmin default search uses the ransack gem, see: https://github.com/activerecord-hackery/ransack
-= form_tag(upmin_search_path(klass: klass.name), method: :get) do
+= form_tag(klass.search_path, method: :get) do
   - klass.attributes.each do |attr_name|
     - type = klass.attribute_type(attr_name)
 
-    -# TODO(jon): Make sure these retain their data on a search
     -# TODO(jon): Break these into partials possibly?
     - if type == :string
       .form-group
@@ -34,4 +33,4 @@
         = date_field(:q, "#{attr_name}_lteq", class: "form-control")
 
   = submit_tag("Search", class: "btn btn-primary btn-block")
-  = link_to("Clear All", upmin_search_path(klass: klass.name), class: "btn btn-default btn-block")
+  = link_to("Clear All", klass.search_path, class: "btn btn-default btn-block")