Merge pull request #51 from marmelab/bug_fix

[RFR] Bugfix on property form
marmelab · May 30, 2014 · 6598ada · 6598ada
2 parents 0345dd6 + fd21f49
commit 6598ada
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/sass/phpcr-browser/properties.scss b/sass/phpcr-browser/properties.scss
@@ -54,7 +54,7 @@
 
     td:nth-child(4) {
       /* Type column */
-      width: 10%;
+      width: 12%;
       vertical-align: middle;
       text-align: center;
     }

diff --git a/web/assets/css/screen.css b/web/assets/css/screen.css
diff --git a/web/assets/js/browser/controllers/properties.js b/web/assets/js/browser/controllers/properties.js
@@ -60,10 +60,10 @@ define([
           });
         }
 
-        return $scope.currentNode.createProperty(name, value).then(function() {
+        return $scope.currentNode.createProperty(name, value, type).then(function() {
           $translate('NODE_ADD_PROPERTY_SUCCESS').then($log.log, $log.log);
           reloadProperties();
-          $scope.name = $scope.value = undefined;
+          $scope.newProperty = {};
           $scope.displayCreateForm = false;
         }, function(err) {
           if (err.data && err.data.message) { return $log.error(err, err.data.message); }

diff --git a/web/assets/js/browser/views/workspace/properties/content.html b/web/assets/js/browser/views/workspace/properties/content.html
@@ -9,7 +9,7 @@
         <input type="text" ng-model="newProperty.value" class="form-control" placeholder="{{ 'NODE_ADD_PROPERTY_VALUE_PROMPT' | translate }}" ui-keypress="keyBinding.createForm.keypress" ui-keydown="keyBinding.createForm.keydown">
       </td>
       <td>
-        <select ng-model="type" class="form-control" ng-options="type.name for type in types">
+        <select ng-model="newProperty.type" class="form-control" ng-options="type.name for type in types">
           <option value="">{{ 'NODE_ADD_PROPERTY_TYPE_PROMPT' | translate }}</option>
         </select>
       </td>

diff --git a/web/assets/js/browser/views/workspace/properties/header.html b/web/assets/js/browser/views/workspace/properties/header.html
@@ -23,7 +23,7 @@
     <a class="btn btn-default btn-sm validate" ng-click="toggleCreateForm()" ng-show="displayCreateForm">
       <span class="glyphicon glyphicon-remove"></span>  {{ 'NODE_ADD_PROPERTY_CANCEL_BUTTON' | translate }}
     </a>
-    <a class="btn btn-primary btn-sm validate" ng-click="createProperty(name, value, type.value)" ng-show="displayCreateForm">
+    <a class="btn btn-primary btn-sm validate" ng-click="createProperty(newProperty.name, newProperty.value, newProperty.type.value)" ng-show="displayCreateForm">
       <span class="glyphicon glyphicon-ok"></span> {{ 'NODE_ADD_PROPERTY_SAVE_BUTTON' | translate }}
     </a>
   </div>