From 7bc83e9441fc6ac8d00c75a7974ef796eb5f315d Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Mon, 31 Mar 2014 21:34:44 -0400
Subject: [PATCH] Make admin_fields_edit be Angular-powered.

Roll includes/hoplite to 38d8c893ebfb727e6f70ee86a155431e8d9fd571.
---
 admin/fields.php                      |  5 +++--
 admin/templates/admin_fields_edit.tpl | 31 +++++++++++++++------------
 includes/hoplite                      |  2 +-
 static/admin.js                       | 12 ++---------
 4 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/admin/fields.php b/admin/fields.php
index a23a626..39c60da 100644
--- a/admin/fields.php
+++ b/admin/fields.php
@@ -31,7 +31,7 @@ class FieldsAction extends http\ActionController implements TemplatePreCaching
 {
 	public function TemplateSet()
 	{
-		return array('admin_fields_list', 'admin_fields_edit');
+		return ['admin_fields_list', 'admin_fields_edit'];
 	}
 
 	public function ActionList(http\Request $request, http\Response $response)
@@ -58,7 +58,8 @@ class FieldsAction extends http\ActionController implements TemplatePreCaching
 		if ($request->http_method != 'POST')
 			$this->controller()->StopWithCode(http\ResponseCode::METHOD_NOT_ALLOWED);
 
-		$this->controller()->StopWithRedirect($this->controller()->MakeURL('/fields/list'));
+		var_dump($request);
+		//$this->controller()->StopWithRedirect($this->controller()->MakeURL('/fields/list'));
 	}
 
 	protected function _GetActionMethod(http\Request $request)
diff --git a/admin/templates/admin_fields_edit.tpl b/admin/templates/admin_fields_edit.tpl
index ff3e1aa..c46a724 100644
--- a/admin/templates/admin_fields_edit.tpl
+++ b/admin/templates/admin_fields_edit.tpl
@@ -1,5 +1,16 @@
 {%#import 'admin_header'%}
 
+<script>
+	var ModelData = {%= $field | json %};
+	var FieldTypes = {%= [
+		bugdar\Field::TYPE_TEXT,
+		bugdar\Field::TYPE_BOOL,
+		bugdar\Field::TYPE_LIST,
+		bugdar\Field::TYPE_DATE,
+		bugdar\Field::TYPE_USER
+	] | json %};
+</script>
+
 <div ng-app="bugdar.admin.fields">
 <div ng-controller="FieldEditor">
 
@@ -7,39 +18,31 @@
 
 	<form action="{%#url '/fields/save'%}" method="post">
 
-		<script type="text/ng-template" id="-/admin/fields/field-type-option.tpl">
-			<option value="{{fieldType}}" ng-selected="fieldType == type">{{fieldType}}</option>
-		</script>
-
 		<label>
 			{%=T('Title:')%}
-			<input type="text" name="title" value="{%= $field->title %}">
+			<input type="text" name="title" ng-model="field.title">
 		</label>
 
 		<label>
 			{%=T('Description:')%}
-			<input type="text" name="description" value="{%= $field->description %}">
+			<input type="text" name="description" ng-model="field.description">
 		</label>
 
 		<label>
 			{%=T('Field Type')%}
-			<select name="type" {%= ($is_new) ?: 'disabled' %}>
-				<option field-type="{%= bugdar\Field::TYPE_TEXT %}"></option>
-				<option field-type="{%= bugdar\Field::TYPE_BOOL %}"></option>
-				<option field-type="{%= bugdar\Field::TYPE_LIST %}"></option>
-				<option field-type="{%= bugdar\Field::TYPE_DATE %}"></option>
-				<option field-type="{%= bugdar\Field::TYPE_USER %}"></option>
+			<select name="type" {%= ($is_new) ?: 'disabled' %} ng-model="field.type">
+				<option ng-repeat="type in fieldTypes" value="{{type}}" ng-selected="type == field.type">{{type}}</option>
 			</select>
 		</label>
 
 		<label>
 			{%=T('Required:')%}
-			<input type="checkbox" name="required" {%= $field->required ? 'checked' : '' %}>
+			<input type="checkbox" name="required" ng-checked="field.required" value="1">
 		</label>
 
 		<label>
 			{%=T('Can Be Searched:')%}
-			<input type="checkbox" name="can_search" {%= $field->can_search ? 'checked' : '' %}>
+			<input type="checkbox" name="can_search" ng-checked="field.can_search" value="1">
 		</label>
 
 		<input type="submit" value="{%=T('Save Field')%}">
diff --git a/includes/hoplite b/includes/hoplite
index dc08cff..38d8c89 160000
--- a/includes/hoplite
+++ b/includes/hoplite
@@ -1 +1 @@
-Subproject commit dc08cff4b89d90466ebc2b3f2a8dc38b611558ab
+Subproject commit 38d8c893ebfb727e6f70ee86a155431e8d9fd571
diff --git a/static/admin.js b/static/admin.js
index 2029413..a5d45ab 100644
--- a/static/admin.js
+++ b/static/admin.js
@@ -15,15 +15,7 @@ angular.module('bugdar.admin.settings', [])
 	}]);
 
 angular.module('bugdar.admin.fields', [])
-	.directive('fieldType', ['$templateCache', function($templateCache) {
-		return {
-			restrict: 'A',
-			replace: true,
-			template: $templateCache.get('-/admin/fields/field-type-option.tpl'),
-			scope: {
-				fieldType: '@'
-			}
-		};
-	}])
 	.controller('FieldEditor', ['$scope', function($scope) {
+		$scope.field = ModelData;
+		$scope.fieldTypes = FieldTypes;
 	}]);
-- 
2.22.5