Skip to content

Commit 34b4291

Browse files
committed
Search fix
1 parent 848386b commit 34b4291

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

Diff for: Zenergy/Zenergy/Pages/products.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ <h2>Products managment</h2>
77
<div class="input-group">
88
<div class="input-group-addon"><i class="glyphicon glyphicon-search"></i></div>
99

10-
<input type="text" class="form-control" placeholder="Search for a product" ng-model="searchProduct">
10+
<input type="text" class="form-control" placeholder="Search for a product (by name)" ng-model="searchProduct.productName">
1111
</div>
1212
</div>
1313
</form>

Diff for: Zenergy/Zenergy/Pages/users.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ <h2>Users managment</h2>
77
<div class="input-group">
88
<div class="input-group-addon"><i class="glyphicon glyphicon-search"></i></div>
99

10-
<input type="text" class="form-control" placeholder="Search for an User" ng-model="searchUser">
10+
<input type="text" class="form-control" placeholder="Search for an Use (by Email)" ng-model="searchUser.mail">
1111

1212
</div>
1313
</div>

Diff for: Zenergy/Zenergy/Properties/PublishProfiles/zenergy.pubxml

+9-5
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,21 @@ en modifiant ce fichier MSBuild. Pour en savoir plus à ce sujet, consultez la p
2121
<_SavePWD>True</_SavePWD>
2222
<PublishDatabaseSettings>
2323
<Objects xmlns="">
24-
<ObjectGroup Name="DefaultConnection" Order="1" Enabled="False">
24+
<ObjectGroup Name="ZenergyContext" Order="2" Enabled="False">
2525
<Destination Path="" />
2626
<Object Type="DbCodeFirst">
27-
<Source Path="DBContext" DbContext="Zenergy.Models.ApplicationDbContext, Zenergy" Origin="Configuration" />
27+
<Source Path="DBContext" DbContext="Zenergy.Models.ZenergyContext, Zenergy" Origin="Configuration" />
2828
</Object>
2929
</ObjectGroup>
30-
<ObjectGroup Name="ZenergyContext" Order="2" Enabled="False">
30+
<ObjectGroup Name="DefaultConnection" Order="3" Enabled="False">
3131
<Destination Path="" />
32-
<Object Type="DbCodeFirst">
33-
<Source Path="DBContext" DbContext="Zenergy.Models.ZenergyContext, Zenergy" Origin="Configuration" />
32+
<Object Type="DbDacFx">
33+
<PreSource Path="Data Source=(LocalDb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\aspnet-Zenergy-20151109023115.mdf;Initial Catalog=aspnet-Zenergy-20151109023115;Integrated Security=True" includeData="False" />
34+
<Source Path="$(IntermediateOutputPath)AutoScripts\DefaultConnection_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
3435
</Object>
36+
<UpdateFrom Type="Web.Config">
37+
<Source MatchValue="Data Source=(LocalDb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\aspnet-Zenergy-20151109023115.mdf;Initial Catalog=aspnet-Zenergy-20151109023115;Integrated Security=True" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
38+
</UpdateFrom>
3539
</ObjectGroup>
3640
</Objects>
3741
</PublishDatabaseSettings>

Diff for: Zenergy/Zenergy/Web.config

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<connectionStrings>
1212
<add name="DefaultConnection" connectionString="Data Source=(LocalDb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\aspnet-Zenergy-20151109023115.mdf;Initial Catalog=aspnet-Zenergy-20151109023115;Integrated Security=True" providerName="System.Data.SqlClient" />
1313
<!-- prod-->
14-
<!--<add name="ZenergyContext" connectionString="metadata=res://*/Models.ZenergyModel.csdl|res://*/Models.ZenergyModel.ssdl|res://*/Models.ZenergyModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=zenergy.cb9xv2w6phgt.us-west-2.rds.amazonaws.com;initial catalog=zenergy;persist security info=True;user id=admin;password=zenergy1;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" /> -->
15-
16-
<!-- test-->
17-
<add name="ZenergyContext" connectionString="metadata=res://*/Models.ZenergyModel.csdl|res://*/Models.ZenergyModel.ssdl|res://*/Models.ZenergyModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=zenergy.cb9xv2w6phgt.us-west-2.rds.amazonaws.com;initial catalog=zenergyTest;persist security info=True;user id=admin;password=zenergy1;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
14+
<!--<add name="ZenergyContext" connectionString="metadata=res://*/Models.ZenergyModel.csdl|res://*/Models.ZenergyModel.ssdl|res://*/Models.ZenergyModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=zenergy.cb9xv2w6phgt.us-west-2.rds.amazonaws.com;initial catalog=zenergy;persist security info=True;user id=admin;password=zenergy1;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />-->
15+
16+
<!-- test-->
17+
<add name="ZenergyContext" connectionString="metadata=res://*/Models.ZenergyModel.csdl|res://*/Models.ZenergyModel.ssdl|res://*/Models.ZenergyModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=zenergy.cb9xv2w6phgt.us-west-2.rds.amazonaws.com;initial catalog=zenergyTest;persist security info=True;user id=admin;password=zenergy1;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
1818

1919
</connectionStrings>
2020
<appSettings></appSettings>

0 commit comments

Comments
 (0)