Skip to content

Commit

Permalink
OOIION-1778 (M156 : schema versioning)
Browse files Browse the repository at this point in the history
Added persisted_version to the edit page black_list, keeping it from appearing on a resources's Edit page.  Even if the FileMaker changes (the ones that include the new schema versioning attrs) haven't been propigated, this won't break anything.

Stashed all FMP CSV files in new ui_specs dir.  r3candidate, specifically.
  • Loading branch information
OOI authored and gkourupes committed Jun 6, 2014
1 parent 11e218f commit 32fe90a
Show file tree
Hide file tree
Showing 19 changed files with 6,822 additions and 1 deletion.
2 changes: 1 addition & 1 deletion static/js/ux-editform.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ IONUX.Models.EditResourceModel = Backbone.Model.extend({
this.resource_id = options.resource_id;
// this.black_list = options.black_list || [];
this.black_list = ['_id', '_rev', 'ts_created', 'ts_updated', 'lcstate', /*'type_',*/ 'alt_ids',
'addl', 'availability', 'message_controllable', 'monitorable'];
'addl', 'availability', 'message_controllable', 'monitorable', 'persisted_version'];
this.nest_depth_factor = options.nest_depth_factor || 50;
Backbone.Form.helpers.keyToTitle = this.key_to_title;
Backbone.Form.editors.List.Modal.ModalAdapter = Backbone.BootstrapModal;
Expand Down
7 changes: 7 additions & 0 deletions ui_specs/r3candidate/Graphic Type.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
__pk_GraphicType_ID,Description,Name
"2040004","Large icon used on map, or other places where space is not an issue, and offset from underlying visuals is needed. On circular background. Has states for Selected, Highlighted, Active, Not Active, etc.","icon_large"
"2040005","State indicator to be used on top of large icons. Has black outline. Has multiple images to represent different values.","badge_map"
"2040006","Other graphic element, e.g, page banner.","graphic"
"2040007","Small icon used in tables and other places where space is a concern. No outlines.","icon_small"
"2040008","Graphic used to draw interaction widget, e.g., down-arrow in scroll-bar or dropdown menu.","widget_graphic"
"2040009","State indicator to be used in non-map locations. Has white outline. Has multiple images to represent different values.","badge_graphic"
98 changes: 98 additions & 0 deletions ui_specs/r3candidate/Graphic.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
__pk_Graphic_ID,_fk_GraphicType_ID,Description,Name
"2110043","2040007","All resources collection","resources_all_mini"
"2110051","2040005","","badge_status_map"
"2110081","2040007","Standalone checkmark","checkmark_mini"
"2110019","2040007","Collection resource type","collection_mini"
"2110052","2040007","A critical alert has been received","status_critical_alert_mini"
"2110050","2040007","","data_document_mini"
"2110020","2040004","DataProcess resource type","data_producer_mm"
"2110090","2040004","","data_set_mm"
"2110022","2040004","Deployment resource type","deployment_mm"
"2110102","2040007","","document_mini"
"2110048","2040007","","folder_mini"
"2110026","2040007","View resource type - Saved search","saved_search_mini"
"2110027","2040004","Site resource type","site_mm"
"2110097","2040007","","subscription_mini"
"2110025","2040007","UserInfo resource type","user_mini"
"2110111","2040007","Base symbol for communications (status)","flow_communications_mini"
"2110112","2040007","Base symbol for power (status)","flow_power_mini"
"2110113","2040007","Base symbol for data production (status)","flow_data_mini"
"2110114","2040007","Base symbol for location (status)","location_mini"
"2110118","2040007","Attachment resource type","attachment_mini"
"2110119","2040007","","data_producer_mini"
"2110120","2040007","","data_product_mini"
"2110121","2040007","","data_set_mini"
"2110122","2040007","","deployment_mini"
"2110123","2040007","","device_mini"
"2110125","2040007","","instrument_mini"
"2110128","2040007","","observatory_mini"
"2110129","2040007","","platform_mini"
"2110130","2040007","","resource_mini"
"2110131","2040007","","sensor_mini"
"2110132","2040007","","site_mini"
"2110137","2040005","","badge_numeric_map"
"2110140","2040009","","badge_status_graphic"
"2110141","2040009","","badge_numeric_graphic"
"2110142","2040006","","map_pin"
"2110066","2040008","","arrow"
"2110033","2040004","Attachment resource type","attachment_mm"
"2110047","2040008","Attribute group view","selector_attribute_group"
"2110096","2040004","","auv_mm"
"2110098","2040004","","battery_mm"
"2110040","2040007","Bookmark current view","bookmark_mini"
"2110093","2040004","","buoy_mm"
"2110065","2040008","Show calendar","calendar"
"2110068","2040008","Checkbox widget box","checkbox_edit"
"2110082","2040008","Show time selector","clock"
"2110086","2040006","Ocean Leadership logo","logo_col"
"2110029","2040006","Base symbol for communications (status)","flow_communications"
"2110031","2040006","Base symbol for data production (status)","flow_data"
"2110089","2040004","","data_product_mm"
"2110083","2040008","Delete item","delete"
"2110091","2040004","","device_mm"
"2110044","2040008","Enter edit mode","edit"
"2110036","2040008","Filter specification view","filter"
"2110095","2040004","","glider_mm"
"2110072","2040008","Iconic indicator for help access","help"
"2110092","2040004","","instrument_mm"
"2110099","2040004","","leakage_mm"
"2110041","2040008","List of object/resource views","menu"
"2110030","2040006","Base symbol for location (status)","location"
"2110042","2040008","Map view","map_view"
"2110076","2040008","Minus symbol used for close or remove/delete","minus"
"2110094","2040004","","mooring_mm"
"2110055","2040007","The asset is offline or unavailable (expected)","status_unknown_mini"
"2110107","2040006","National Science Foundation logo","logo_nsf"
"2110088","2040004","","observatory_mm"
"2110061","2040006","Page header graphic","banner_ooi"
"2110085","2040006","OOI logo","logo_ooi"
"2110024","2040004","PlatformDevice resource type","platform_mm"
"2110046","2040008","Chart view","selector_plot"
"2110075","2040008","Plus symbol used for open or add","plus"
"2110034","2040007","Policy resource type","policy_mini"
"2110028","2040006","Base symbol for power (status)","flow_power"
"2110069","2040008","Radiobutton widget box","radiobutton"
"2110087","2040004","","resource_mm"
"2110063","2040008","Indicator that indicated value is above sealevel","toggle_sealevel"
"2110035","2040008","Search by query specification view","search"
"2110032","2040004","SensorDevice resource type","sensor_mm"
"2110037","2040008","Settings view","settings"
"2110057","2040007","All assets are reporting status good","status_ok_mini"
"2110045","2040008","Table view","selector_table"
"2110100","2040004","","vacuum_mm"
"2110053","2040007","A warning has been received","status_warning_alert_mini"
"2110109","2040008","","selector_full_view"
"2110110","2040007","","status_off_mini"
"2110116","2040008","","busy_indicator"
"2110117","2040008","","expand_combo"
"2110124","2040007","","glider_mini"
"2110126","2040007","","leakage_mini"
"2110127","2040007","","mooring_mini"
"2110134","2040007","","vacuum_mini"
"2110143","2040008","","expand_block"
"2110146","2040008","","selector_view_menu"
"2110147","2040008","","selector_view_menu_split"
"2110148","2040008","Latitude toggle","toggle_ns"
"2110149","2040008","Longitude toggle","toggle_ew"
"2110150","2040006","","edit_close"
"2110151","2040006","Standalone check box","checkbox_standalone"
Loading

0 comments on commit 32fe90a

Please sign in to comment.