Skip to content

Commit

Permalink
Merge pull request #698 from alexrchies/master
Browse files Browse the repository at this point in the history 
Merge dev/front
  • Loading branch information
@alexrchies
alexrchies committed Aug 26, 2015
2 parents b93f2df + 75ee01f commit f38c75e
Show file tree
Hide file tree
Showing 19 changed files with 372 additions and 169 deletions.
302 changes: 151 additions & 151 deletions web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,157 +85,157 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<executions>
<execution>
<id>mkdir node</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
mkdir
</executable>
<arguments>
<argument>-p</argument>
<argument>${user.home}/sparkta/node</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>mkdir node_modules</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
mkdir
</executable>
<arguments>
<argument>-p</argument>
<argument>${user.home}/sparkta/node_modules</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>mkdir bower_components</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
mkdir
</executable>
<arguments>
<argument>-p</argument>
<argument>${user.home}/sparkta/bower_components</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>rm ln node</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
rm
</executable>
<arguments>
<argument>-rf</argument>
<argument>node</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>rm ln node_modules</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
rm
</executable>
<arguments>
<argument>-rf</argument>
<argument>node_modules</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>rm ln bower_components</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
rm
</executable>
<arguments>
<argument>-rf</argument>
<argument>bower_components</argument>
</arguments>
</configuration>
</execution>
<!--<execution>
<id>ln node</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
ln
</executable>
<arguments>
<argument>-s</argument>
<argument>${user.home}/sparkta/node</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>ln node_modules</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
ln
</executable>
<arguments>
<argument>-s</argument>
<argument>${user.home}/sparkta/node_modules</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>ln bower_components</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
ln
</executable>
<arguments>
<argument>-s</argument>
<argument>${user.home}/sparkta/bower_components</argument>
</arguments>
</configuration>
</execution>-->
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<executions>
<execution>
<id>mkdir node</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
mkdir
</executable>
<arguments>
<argument>-p</argument>
<argument>${user.home}/sparkta/node</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>mkdir node_modules</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
mkdir
</executable>
<arguments>
<argument>-p</argument>
<argument>${user.home}/sparkta/node_modules</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>mkdir bower_components</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
mkdir
</executable>
<arguments>
<argument>-p</argument>
<argument>${user.home}/sparkta/bower_components</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>rm ln node</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
rm
</executable>
<arguments>
<argument>-rf</argument>
<argument>node</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>rm ln node_modules</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
rm
</executable>
<arguments>
<argument>-rf</argument>
<argument>node_modules</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>rm ln bower_components</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
rm
</executable>
<arguments>
<argument>-rf</argument>
<argument>bower_components</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>ln node</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
ln
</executable>
<arguments>
<argument>-s</argument>
<argument>${user.home}/sparkta/node</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>ln node_modules</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
ln
</executable>
<arguments>
<argument>-s</argument>
<argument>${user.home}/sparkta/node_modules</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>ln bower_components</id>
<phase>generate-sources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>
ln
</executable>
<arguments>
<argument>-s</argument>
<argument>${user.home}/sparkta/bower_components</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
1 change: 1 addition & 0 deletions web/src/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<!-- Form directives -->
<script src="stratio-ui/script/directives/forms/datasource-form-field-directive.js"></script>
<script src="stratio-ui/script/directives/forms/form-field-input-directive.js"></script>
<script src="stratio-ui/script/directives/forms/form-field-select-directive.js"></script>
<!-- Factories ----------------------------------- -->
<script src="scripts/services/fragment-factory.js"></script>
<script src="scripts/services/template-factory.js"></script>
Expand Down
7 changes: 6 additions & 1 deletion web/src/languages/en-US.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"_HELP_": "Do you need help?",
"_CANCEL_": "Cancel",
"_VIEW_MORE_": "View more",
"_NAME_": "Name",
"_DESCRIPTION_": "Description",

"_HEADER_MENU_DASHBOARD_": "dashboard",
"_HEADER_MENU_SETTINGS_": "settings",
Expand Down Expand Up @@ -46,6 +49,8 @@
"_INPUT_BUTTON_CANCEL_": "cancel",
"_INPUT_BUTTON_DUPLICATE_": "duplicate",

"_INPUT_ERROR_NAME_EXISTS_": "There was an error. The name already exists!"
"_INPUT_ERROR_NAME_EXISTS_": "There was an error. The name already exists!",

"_POLICY_HEADER_TITLE_MAIN_": "Policies"
}

7 changes: 5 additions & 2 deletions web/src/scripts/controllers/inputs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
'button_icon': 'icon-circle-check'
}
};

vm.editInputModal(editInputData);
},
function (error) {
Expand Down Expand Up @@ -385,6 +385,8 @@
vm.createTypeModels(vm.templateInputsData);
vm.selectedIndex = 0;
}

console.log(vm.dataSource);
};

function setTexts(texts) {
Expand Down Expand Up @@ -415,7 +417,8 @@
vm.properties[fragmentData[i].name] = {};

for (var j=0; j<fragmentData[i].properties.length; j++) {
if (fragmentData[i].properties[j].propertyId !== 'name' && fragmentData[i].properties[j].propertyId !== 'type'){
/*if (fragmentData[i].properties[j].propertyId !== 'name' && fragmentData[i].properties[j].propertyId !== 'type'){*/
if (fragmentData[i].properties[j].propertyId !== 'name'){
vm.properties[fragmentData[i].name][fragmentData[i].properties[j].propertyId] = '';
}
}
Expand Down
2 changes: 1 addition & 1 deletion web/src/stratio-ui/script/directives/forms/datasource-form-field-directive.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
if (scope.field && scope.field.hasOwnProperty('visible')) {
for (var i=0; i<scope.field.visible.length; i++) {
var actual = scope.field.visible[i];
if (actual.value === scope.model[actual.propertyId].value) {
if (actual.value === scope.model[actual[0].propertyId].value) {
if(scope.field.visible[i].hasOwnProperty('overrideProps')){
for (var f = 0; f < scope.field.visible[i].overrideProps.length ; f++ ){
var overrideProps = scope.field.visible[i].overrideProps[f];
Expand Down
Loading

0 comments on commit f38c75e

Please sign in to comment.